diff options
Diffstat (limited to 'android/namespace_test.go')
| -rw-r--r-- | android/namespace_test.go | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/android/namespace_test.go b/android/namespace_test.go index 1caf5a87f..dea287d84 100644 --- a/android/namespace_test.go +++ b/android/namespace_test.go @@ -633,21 +633,21 @@ func mockFiles(bps map[string]string) (files map[string][]byte) { } func setupTestFromFiles(t *testing.T, bps MockFS) (ctx *TestContext, errs []error) { - result := emptyTestFixtureFactory. + result := GroupFixturePreparers( + FixtureModifyContext(func(ctx *TestContext) { + ctx.RegisterModuleType("test_module", newTestModule) + ctx.RegisterModuleType("soong_namespace", NamespaceFactory) + ctx.Context.RegisterModuleType("blueprint_test_module", newBlueprintTestModule) + ctx.PreArchMutators(RegisterNamespaceMutator) + ctx.PreDepsMutators(func(ctx RegisterMutatorsContext) { + ctx.BottomUp("rename", renameMutator) + }) + }), + bps.AddToFixture(), + ). // Ignore errors for now so tests can check them later. ExtendWithErrorHandler(FixtureIgnoreErrors). - RunTest(t, - FixtureModifyContext(func(ctx *TestContext) { - ctx.RegisterModuleType("test_module", newTestModule) - ctx.RegisterModuleType("soong_namespace", NamespaceFactory) - ctx.Context.RegisterModuleType("blueprint_test_module", newBlueprintTestModule) - ctx.PreArchMutators(RegisterNamespaceMutator) - ctx.PreDepsMutators(func(ctx RegisterMutatorsContext) { - ctx.BottomUp("rename", renameMutator) - }) - }), - bps.AddToFixture(), - ) + RunTest(t) return result.TestContext, result.Errs } |