From c28bb0b8f9458404f0c6651ba41c8c28849efbdf Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 25 Feb 2019 14:20:47 -0800 Subject: [PATCH] Move some java test setup later Move ctx.Register() from testContext() to run() so that tests can register more singletons before the env singleton is registered. Any singletons registered after the env singleton will hit an error if they attempt to read an environment variable. Move setDexpreoptTestGlobalConfig from TestConfig to run() so that a test can set their own custom config after TestConfig but before run(). Test: All Soong tests Change-Id: Iec47f4b7898736f583cbd6bd53e4d02a035f4fb2 --- java/java_test.go | 8 ++++++-- java/testing.go | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/java_test.go b/java/java_test.go index 8d3efcb81..817955cad 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -24,6 +24,7 @@ import ( "android/soong/android" "android/soong/cc" + "android/soong/dexpreopt" "android/soong/genrule" ) @@ -101,8 +102,6 @@ func testContext(config android.Config, bp string, ctx.BottomUp("begin", cc.BeginMutator).Parallel() }) - ctx.Register() - bp += GatherRequiredDepsForTest() mockFS := map[string][]byte{ @@ -187,6 +186,11 @@ func testContext(config android.Config, bp string, func run(t *testing.T, ctx *android.TestContext, config android.Config) { t.Helper() + + pathCtx := android.PathContextForTesting(config, nil) + setDexpreoptTestGlobalConfig(config, dexpreopt.GlobalConfigForTests(pathCtx)) + + ctx.Register() _, errs := ctx.ParseFileList(".", []string{"Android.bp", "prebuilts/sdk/Android.bp"}) android.FailIfErrored(t, errs) _, errs = ctx.PrepareBuildActions(config) diff --git a/java/testing.go b/java/testing.go index 6c4020ce5..6febfa1d3 100644 --- a/java/testing.go +++ b/java/testing.go @@ -18,7 +18,6 @@ import ( "fmt" "android/soong/android" - "android/soong/dexpreopt" ) func TestConfig(buildDir string, env map[string]string) android.Config { @@ -31,9 +30,6 @@ func TestConfig(buildDir string, env map[string]string) android.Config { config := android.TestArchConfig(buildDir, env) config.TestProductVariables.DeviceSystemSdkVersions = []string{"14", "15"} - pathCtx := android.PathContextForTesting(config, nil) - setDexpreoptTestGlobalConfig(config, dexpreopt.GlobalConfigForTests(pathCtx)) - return config }