From c3e6ce04d96ca7a566c4fa5376c7c691b0b73c78 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 22 Mar 2021 23:21:32 +0000 Subject: [PATCH 1/2] Remove buildDir from cc package Bug: 182885307 Test: m nothing Change-Id: I964af3cb9a3e7a1dfbd9d5176a702591f6b19f16 --- cc/cc_test.go | 56 ++++++++++++-------------------------- cc/genrule_test.go | 2 +- cc/library_test.go | 4 +-- cc/vendor_snapshot_test.go | 30 ++++++++++---------- 4 files changed, 35 insertions(+), 57 deletions(-) diff --git a/cc/cc_test.go b/cc/cc_test.go index ab4ef6cff..c00dfb46c 100644 --- a/cc/cc_test.go +++ b/cc/cc_test.go @@ -16,7 +16,6 @@ package cc import ( "fmt" - "io/ioutil" "os" "path/filepath" "reflect" @@ -27,33 +26,12 @@ import ( "android/soong/android" ) -var buildDir string - -func setUp() { - var err error - buildDir, err = ioutil.TempDir("", "soong_cc_test") - if err != nil { - panic(err) - } -} - -func tearDown() { - os.RemoveAll(buildDir) -} - func TestMain(m *testing.M) { - run := func() int { - setUp() - defer tearDown() - - return m.Run() - } - - os.Exit(run()) + os.Exit(m.Run()) } var ccFixtureFactory = android.NewFixtureFactory( - &buildDir, + nil, prepareForCcTest, ) @@ -101,7 +79,7 @@ func testCc(t *testing.T, bp string) *android.TestContext { // deprecated func testCcNoVndk(t *testing.T, bp string) *android.TestContext { t.Helper() - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.Platform_vndk_version = StringPtr("VER") return testCcWithConfig(t, config) @@ -114,7 +92,7 @@ func testCcNoVndk(t *testing.T, bp string) *android.TestContext { // deprecated func testCcNoProductVndk(t *testing.T, bp string) *android.TestContext { t.Helper() - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") @@ -141,7 +119,7 @@ func testCcErrorWithConfig(t *testing.T, pattern string, config android.Config) // deprecated func testCcError(t *testing.T, pattern string, bp string) { t.Helper() - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") testCcErrorWithConfig(t, pattern, config) @@ -155,7 +133,7 @@ func testCcError(t *testing.T, pattern string, bp string) { // deprecated func testCcErrorProductVndk(t *testing.T, pattern string, bp string) { t.Helper() - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.ProductVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") @@ -474,7 +452,7 @@ func TestVndk(t *testing.T) { } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.ProductVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") @@ -495,7 +473,7 @@ func TestVndk(t *testing.T) { // Check VNDK snapshot output. snapshotDir := "vndk-snapshot" - snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64") + snapshotVariantPath := filepath.Join("out/soong", snapshotDir, "arm64") vndkLibPath := filepath.Join(snapshotVariantPath, fmt.Sprintf("arch-%s-%s", "arm64", "armv8-a")) @@ -596,7 +574,7 @@ func TestVndkLibrariesTxtAndroidMk(t *testing.T) { name: "llndk.libraries.txt", insert_vndk_version: true, }` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") ctx := testCcWithConfig(t, config) @@ -646,7 +624,7 @@ func TestVndkUsingCoreVariant(t *testing.T) { } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true) @@ -673,7 +651,7 @@ func TestDataLibs(t *testing.T) { } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true) @@ -724,7 +702,7 @@ func TestDataLibsRelativeInstallPath(t *testing.T) { } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true) @@ -1349,7 +1327,7 @@ func TestVndkExt(t *testing.T) { nocrt: true, } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.ProductVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") @@ -1794,7 +1772,7 @@ func TestProductVndkExtDependency(t *testing.T) { nocrt: true, } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.ProductVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") @@ -2349,7 +2327,7 @@ func TestMakeLinkType(t *testing.T) { } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") // native:vndk @@ -3141,7 +3119,7 @@ func TestDataLibsPrebuiltSharedTestLibrary(t *testing.T) { } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true) @@ -3536,7 +3514,7 @@ func TestInstallSharedLibs(t *testing.T) { } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) ctx := testCcWithConfig(t, config) hostBin := ctx.ModuleForTests("bin", config.BuildOSTarget.String()).Description("install") diff --git a/cc/genrule_test.go b/cc/genrule_test.go index fa0c6f209..45b343b5a 100644 --- a/cc/genrule_test.go +++ b/cc/genrule_test.go @@ -52,7 +52,7 @@ func TestArchGenruleCmd(t *testing.T) { }, } ` - config := android.TestArchConfig(buildDir, nil, bp, fs) + config := android.TestArchConfig(t.TempDir(), nil, bp, fs) ctx := testGenruleContext(config) diff --git a/cc/library_test.go b/cc/library_test.go index 49838b48e..797527547 100644 --- a/cc/library_test.go +++ b/cc/library_test.go @@ -199,7 +199,7 @@ func TestStubsVersions(t *testing.T) { }, } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.Platform_version_active_codenames = []string{"R"} ctx := testCcWithConfig(t, config) @@ -222,7 +222,7 @@ func TestStubsVersions_NotSorted(t *testing.T) { }, } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.Platform_version_active_codenames = []string{"R"} testCcErrorWithConfig(t, `"libfoo" .*: versions: not sorted`, config) } diff --git a/cc/vendor_snapshot_test.go b/cc/vendor_snapshot_test.go index 083327740..8d13cebe6 100644 --- a/cc/vendor_snapshot_test.go +++ b/cc/vendor_snapshot_test.go @@ -86,7 +86,7 @@ func TestVendorSnapshotCapture(t *testing.T) { symbol_file: "", } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") ctx := testCcWithConfig(t, config) @@ -94,7 +94,7 @@ func TestVendorSnapshotCapture(t *testing.T) { // Check Vendor snapshot output. snapshotDir := "vendor-snapshot" - snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64") + snapshotVariantPath := filepath.Join("out/soong", snapshotDir, "arm64") snapshotSingleton := ctx.SingletonForTests("vendor-snapshot") var jsonFiles []string @@ -212,7 +212,7 @@ func TestVendorSnapshotDirected(t *testing.T) { nocrt: true, } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.DirectedVendorSnapshot = true @@ -224,7 +224,7 @@ func TestVendorSnapshotDirected(t *testing.T) { // Check Vendor snapshot output. snapshotDir := "vendor-snapshot" - snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64") + snapshotVariantPath := filepath.Join("out/soong", snapshotDir, "arm64") snapshotSingleton := ctx.SingletonForTests("vendor-snapshot") var includeJsonFiles []string @@ -516,7 +516,7 @@ func TestVendorSnapshotUse(t *testing.T) { "vndk/libvndk.so": nil, } - config := TestConfig(buildDir, android.Android, nil, "", mockFS) + config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS) config.TestProductVariables.DeviceVndkVersion = StringPtr("BOARD") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") ctx := CreateTestContext(config) @@ -628,7 +628,7 @@ func TestVendorSnapshotSanitizer(t *testing.T) { }, } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("BOARD") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") ctx := testCcWithConfig(t, config) @@ -707,7 +707,7 @@ func TestVendorSnapshotExclude(t *testing.T) { "device/vendor.cpp": nil, } - config := TestConfig(buildDir, android.Android, nil, "", mockFS) + config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") ctx := CreateTestContext(config) @@ -730,7 +730,7 @@ func TestVendorSnapshotExclude(t *testing.T) { // Verify the content of the vendor snapshot. snapshotDir := "vendor-snapshot" - snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64") + snapshotVariantPath := filepath.Join("out/soong", snapshotDir, "arm64") snapshotSingleton := ctx.SingletonForTests("vendor-snapshot") var includeJsonFiles []string @@ -799,7 +799,7 @@ func TestVendorSnapshotExcludeInVendorProprietaryPathErrors(t *testing.T) { "device/vendor.cpp": nil, } - config := TestConfig(buildDir, android.Android, nil, "", mockFS) + config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") ctx := CreateTestContext(config) @@ -873,7 +873,7 @@ func TestRecoverySnapshotCapture(t *testing.T) { recovery_available: true, } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.RecoverySnapshotVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") ctx := testCcWithConfig(t, config) @@ -881,7 +881,7 @@ func TestRecoverySnapshotCapture(t *testing.T) { // Check Recovery snapshot output. snapshotDir := "recovery-snapshot" - snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64") + snapshotVariantPath := filepath.Join("out/soong", snapshotDir, "arm64") snapshotSingleton := ctx.SingletonForTests("recovery-snapshot") var jsonFiles []string @@ -991,7 +991,7 @@ func TestRecoverySnapshotExclude(t *testing.T) { "device/recovery.cpp": nil, } - config := TestConfig(buildDir, android.Android, nil, "", mockFS) + config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS) config.TestProductVariables.RecoverySnapshotVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") ctx := CreateTestContext(config) @@ -1014,7 +1014,7 @@ func TestRecoverySnapshotExclude(t *testing.T) { // Verify the content of the recovery snapshot. snapshotDir := "recovery-snapshot" - snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64") + snapshotVariantPath := filepath.Join("out/soong", snapshotDir, "arm64") snapshotSingleton := ctx.SingletonForTests("recovery-snapshot") var includeJsonFiles []string @@ -1091,7 +1091,7 @@ func TestRecoverySnapshotDirected(t *testing.T) { nocrt: true, } ` - config := TestConfig(buildDir, android.Android, nil, bp, nil) + config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.RecoverySnapshotVersion = StringPtr("current") config.TestProductVariables.Platform_vndk_version = StringPtr("VER") @@ -1104,7 +1104,7 @@ func TestRecoverySnapshotDirected(t *testing.T) { // Check recovery snapshot output. snapshotDir := "recovery-snapshot" - snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64") + snapshotVariantPath := filepath.Join("out/soong", snapshotDir, "arm64") snapshotSingleton := ctx.SingletonForTests("recovery-snapshot") var includeJsonFiles []string From 8567f226e4820c13981cc59a52711e864e58e45a Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 23 Mar 2021 00:02:06 +0000 Subject: [PATCH 2/2] Remove ccFixtureFactory Bug: 182885307 Test: m nothing Change-Id: Ia3e93b8ab70a7a6a986debd837bd2df84b234847 --- cc/cc_test.go | 58 ++++++++++++++++++++++++++------------------- cc/prebuilt_test.go | 9 ++++--- 2 files changed, 39 insertions(+), 28 deletions(-) diff --git a/cc/cc_test.go b/cc/cc_test.go index c00dfb46c..19596c3f2 100644 --- a/cc/cc_test.go +++ b/cc/cc_test.go @@ -30,11 +30,6 @@ func TestMain(m *testing.M) { os.Exit(m.Run()) } -var ccFixtureFactory = android.NewFixtureFactory( - nil, - prepareForCcTest, -) - var prepareForCcTest = android.GroupFixturePreparers( PrepareForTestWithCcIncludeVndk, android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { @@ -44,35 +39,35 @@ var prepareForCcTest = android.GroupFixturePreparers( }), ) -// testCcWithConfig runs tests using the ccFixtureFactory +// testCcWithConfig runs tests using the prepareForCcTest // // See testCc for an explanation as to how to stop using this deprecated method. // // deprecated func testCcWithConfig(t *testing.T, config android.Config) *android.TestContext { t.Helper() - result := ccFixtureFactory.RunTestWithConfig(t, config) + result := prepareForCcTest.RunTestWithConfig(t, config) return result.TestContext } -// testCc runs tests using the ccFixtureFactory +// testCc runs tests using the prepareForCcTest // -// Do not add any new usages of this, instead use the ccFixtureFactory directly as it makes it much +// Do not add any new usages of this, instead use the prepareForCcTest directly as it makes it much // easier to customize the test behavior. // // If it is necessary to customize the behavior of an existing test that uses this then please first -// convert the test to using ccFixtureFactory first and then in a following change add the +// convert the test to using prepareForCcTest first and then in a following change add the // appropriate fixture preparers. Keeping the conversion change separate makes it easy to verify // that it did not change the test behavior unexpectedly. // // deprecated func testCc(t *testing.T, bp string) *android.TestContext { t.Helper() - result := ccFixtureFactory.RunTestWithBp(t, bp) + result := prepareForCcTest.RunTestWithBp(t, bp) return result.TestContext } -// testCcNoVndk runs tests using the ccFixtureFactory +// testCcNoVndk runs tests using the prepareForCcTest // // See testCc for an explanation as to how to stop using this deprecated method. // @@ -85,7 +80,7 @@ func testCcNoVndk(t *testing.T, bp string) *android.TestContext { return testCcWithConfig(t, config) } -// testCcNoProductVndk runs tests using the ccFixtureFactory +// testCcNoProductVndk runs tests using the prepareForCcTest // // See testCc for an explanation as to how to stop using this deprecated method. // @@ -99,7 +94,7 @@ func testCcNoProductVndk(t *testing.T, bp string) *android.TestContext { return testCcWithConfig(t, config) } -// testCcErrorWithConfig runs tests using the ccFixtureFactory +// testCcErrorWithConfig runs tests using the prepareForCcTest // // See testCc for an explanation as to how to stop using this deprecated method. // @@ -107,12 +102,12 @@ func testCcNoProductVndk(t *testing.T, bp string) *android.TestContext { func testCcErrorWithConfig(t *testing.T, pattern string, config android.Config) { t.Helper() - ccFixtureFactory.Extend(). + prepareForCcTest. ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(pattern)). RunTestWithConfig(t, config) } -// testCcError runs tests using the ccFixtureFactory +// testCcError runs tests using the prepareForCcTest // // See testCc for an explanation as to how to stop using this deprecated method. // @@ -126,7 +121,7 @@ func testCcError(t *testing.T, pattern string, bp string) { return } -// testCcErrorProductVndk runs tests using the ccFixtureFactory +// testCcErrorProductVndk runs tests using the prepareForCcTest // // See testCc for an explanation as to how to stop using this deprecated method. // @@ -171,7 +166,10 @@ func TestFuchsiaDeps(t *testing.T) { }, }` - result := ccFixtureFactory.Extend(PrepareForTestOnFuchsia).RunTestWithBp(t, bp) + result := android.GroupFixturePreparers( + prepareForCcTest, + PrepareForTestOnFuchsia, + ).RunTestWithBp(t, bp) rt := false fb := false @@ -207,7 +205,10 @@ func TestFuchsiaTargetDecl(t *testing.T) { }, }` - result := ccFixtureFactory.Extend(PrepareForTestOnFuchsia).RunTestWithBp(t, bp) + result := android.GroupFixturePreparers( + prepareForCcTest, + PrepareForTestOnFuchsia, + ).RunTestWithBp(t, bp) ld := result.ModuleForTests("libTest", "fuchsia_arm64_shared").Rule("ld") var objs []string for _, o := range ld.Inputs { @@ -2099,7 +2100,7 @@ func TestEnforceProductVndkVersion(t *testing.T) { } ` - ctx := ccFixtureFactory.RunTestWithBp(t, bp).TestContext + ctx := prepareForCcTest.RunTestWithBp(t, bp).TestContext checkVndkModule(t, ctx, "libvndk", "", false, "", productVariant) checkVndkModule(t, ctx, "libvndk_sp", "", true, "", productVariant) @@ -3435,7 +3436,8 @@ func TestProductVariableDefaults(t *testing.T) { } ` - result := ccFixtureFactory.Extend( + result := android.GroupFixturePreparers( + prepareForCcTest, android.PrepareForTestWithVariables, android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { @@ -3462,7 +3464,8 @@ func TestEmptyWholeStaticLibsAllowMissingDependencies(t *testing.T) { } ` - result := ccFixtureFactory.Extend( + result := android.GroupFixturePreparers( + prepareForCcTest, android.PrepareForTestWithAllowMissingDependencies, ).RunTestWithBp(t, bp) @@ -3805,7 +3808,10 @@ var prepareForTestWithMemtagHeap = android.GroupFixturePreparers( func TestSanitizeMemtagHeap(t *testing.T) { variant := "android_arm64_armv8-a" - result := ccFixtureFactory.Extend(prepareForTestWithMemtagHeap).RunTest(t) + result := android.GroupFixturePreparers( + prepareForCcTest, + prepareForTestWithMemtagHeap, + ).RunTest(t) ctx := result.TestContext checkHasMemtagNote(t, ctx.ModuleForTests("default_test", variant), Sync) @@ -3860,7 +3866,8 @@ func TestSanitizeMemtagHeap(t *testing.T) { func TestSanitizeMemtagHeapWithSanitizeDevice(t *testing.T) { variant := "android_arm64_armv8-a" - result := ccFixtureFactory.Extend( + result := android.GroupFixturePreparers( + prepareForCcTest, prepareForTestWithMemtagHeap, android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { variables.SanitizeDevice = []string{"memtag_heap"} @@ -3920,7 +3927,8 @@ func TestSanitizeMemtagHeapWithSanitizeDevice(t *testing.T) { func TestSanitizeMemtagHeapWithSanitizeDeviceDiag(t *testing.T) { variant := "android_arm64_armv8-a" - result := ccFixtureFactory.Extend( + result := android.GroupFixturePreparers( + prepareForCcTest, prepareForTestWithMemtagHeap, android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { variables.SanitizeDevice = []string{"memtag_heap"} diff --git a/cc/prebuilt_test.go b/cc/prebuilt_test.go index f72371a54..fa6dd87eb 100644 --- a/cc/prebuilt_test.go +++ b/cc/prebuilt_test.go @@ -22,14 +22,17 @@ import ( "github.com/google/blueprint" ) -var prebuiltFixtureFactory = ccFixtureFactory.Extend( +var prepareForPrebuiltTest = android.GroupFixturePreparers( + prepareForCcTest, android.PrepareForTestWithAndroidMk, ) func testPrebuilt(t *testing.T, bp string, fs android.MockFS, handlers ...android.FixturePreparer) *android.TestContext { - result := prebuiltFixtureFactory.Extend( + result := android.GroupFixturePreparers( + prepareForPrebuiltTest, fs.AddToFixture(), - ).Extend(handlers...).RunTestWithBp(t, bp) + android.GroupFixturePreparers(handlers...), + ).RunTestWithBp(t, bp) return result.TestContext }