diff options
Diffstat (limited to 'android/androidmk_test.go')
| -rw-r--r-- | android/androidmk_test.go | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/android/androidmk_test.go b/android/androidmk_test.go index 2f568fb13..230b1ec0b 100644 --- a/android/androidmk_test.go +++ b/android/androidmk_test.go @@ -141,21 +141,17 @@ func customModuleFactory() Module { // bp module and then returns the config and the custom module called "foo". func buildContextAndCustomModuleFoo(t *testing.T, bp string) (*TestContext, *customModule) { t.Helper() - config := TestConfig(buildDir, nil, bp, nil) - config.katiEnabled = true // Enable androidmk Singleton - - ctx := NewTestContext(config) - ctx.RegisterSingletonType("androidmk", AndroidMkSingleton) - ctx.RegisterModuleType("custom", customModuleFactory) - ctx.Register() - - _, errs := ctx.ParseFileList(".", []string{"Android.bp"}) - FailIfErrored(t, errs) - _, errs = ctx.PrepareBuildActions(config) - FailIfErrored(t, errs) - - module := ctx.ModuleForTests("foo", "").Module().(*customModule) - return ctx, module + result := emptyTestFixtureFactory.RunTest(t, + // Enable androidmk Singleton + PrepareForTestWithAndroidMk, + FixtureRegisterWithContext(func(ctx RegistrationContext) { + ctx.RegisterModuleType("custom", customModuleFactory) + }), + FixtureWithRootAndroidBp(bp), + ) + + module := result.ModuleForTests("foo", "").Module().(*customModule) + return result.TestContext, module } func TestAndroidMkSingleton_PassesUpdatedAndroidMkDataToCustomCallback(t *testing.T) { |