diff options
Diffstat (limited to 'cc/cc_test.go')
| -rw-r--r-- | cc/cc_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/cc_test.go b/cc/cc_test.go index 90ec8113c..e90670672 100644 --- a/cc/cc_test.go +++ b/cc/cc_test.go @@ -382,7 +382,7 @@ func TestDataLibsRelativeInstallPath(t *testing.T) { if !strings.HasSuffix(outputPath, "/main_test") { t.Errorf("expected test output file to be 'main_test', but was '%s'", outputPath) } - entries := android.AndroidMkEntriesForTest(t, ctx, module)[0] + entries := android.AndroidMkInfoForTest(t, ctx, module).PrimaryInfo if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][0], ":test_lib.so:foo/bar/baz") { t.Errorf("expected LOCAL_TEST_DATA to end with `:test_lib.so:foo/bar/baz`,"+ " but was '%s'", entries.EntryMap["LOCAL_TEST_DATA"][0]) @@ -410,7 +410,7 @@ func TestTestBinaryTestSuites(t *testing.T) { ctx := prepareForCcTest.RunTestWithBp(t, bp).TestContext module := ctx.ModuleForTests("main_test", "android_arm_armv7-a-neon").Module() - entries := android.AndroidMkEntriesForTest(t, ctx, module)[0] + entries := android.AndroidMkInfoForTest(t, ctx, module).PrimaryInfo compatEntries := entries.EntryMap["LOCAL_COMPATIBILITY_SUITE"] if len(compatEntries) != 2 { t.Errorf("expected two elements in LOCAL_COMPATIBILITY_SUITE. got %d", len(compatEntries)) @@ -442,7 +442,7 @@ func TestTestLibraryTestSuites(t *testing.T) { ctx := prepareForCcTest.RunTestWithBp(t, bp).TestContext module := ctx.ModuleForTests("main_test_lib", "android_arm_armv7-a-neon_shared").Module() - entries := android.AndroidMkEntriesForTest(t, ctx, module)[0] + entries := android.AndroidMkInfoForTest(t, ctx, module).PrimaryInfo compatEntries := entries.EntryMap["LOCAL_COMPATIBILITY_SUITE"] if len(compatEntries) != 2 { t.Errorf("expected two elements in LOCAL_COMPATIBILITY_SUITE. got %d", len(compatEntries)) @@ -1431,7 +1431,7 @@ func TestDataLibsPrebuiltSharedTestLibrary(t *testing.T) { if !strings.HasSuffix(outputPath, "/main_test") { t.Errorf("expected test output file to be 'main_test', but was '%s'", outputPath) } - entries := android.AndroidMkEntriesForTest(t, ctx, module)[0] + entries := android.AndroidMkInfoForTest(t, ctx, module).PrimaryInfo if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][0], ":test_lib.so:foo/bar/baz") { t.Errorf("expected LOCAL_TEST_DATA to end with `:test_lib.so:foo/bar/baz`,"+ " but was '%s'", entries.EntryMap["LOCAL_TEST_DATA"][0]) |