From 3333889da5b31132fef90848b7630e1b2e793363 Mon Sep 17 00:00:00 2001 From: Jack He Date: Wed, 19 Sep 2018 02:21:28 -0700 Subject: [PATCH] TradeFed: Add "test_config_template" flag in Android.bp * Allow module owner to specify a test_config_template in Android.bp * The rule goes: 1. When "test_config" is set, Soong uses specified test config 2. If 1 is not true, check if "AndroidTest.xml" exist in the directory, if so, use "AndroidTest.xml 3. If 1 and 2 are not true, check if "test_config_template" is set. If so, use module specific template to generate test config 4. Otherwise, use Soong default template for test config for autogen Bug: 113359343 Test: make Change-Id: I9fb4b2b266be9e0c7cf23da4a51e1c8ae67cd857 --- cc/test.go | 16 ++++++++-- java/app.go | 3 +- java/java.go | 7 ++++- tradefed/autogen.go | 72 ++++++++++++++++++++++++++++++++------------- 4 files changed, 73 insertions(+), 25 deletions(-) diff --git a/cc/test.go b/cc/test.go index b67341e03..3fffffcd3 100644 --- a/cc/test.go +++ b/cc/test.go @@ -49,6 +49,10 @@ type TestBinaryProperties struct { // the name of the test configuration (for example "AndroidTest.xml") that should be // installed with the module. Test_config *string `android:"arch_variant"` + + // the name of the test configuration template (for example "AndroidTestTemplate.xml") that + // should be installed with the module. + Test_config_template *string `android:"arch_variant"` } func init() { @@ -220,6 +224,7 @@ func (test *testBinary) linkerInit(ctx BaseModuleContext) { func (test *testBinary) linkerDeps(ctx DepsContext, deps Deps) Deps { android.ExtractSourcesDeps(ctx, test.Properties.Data) android.ExtractSourceDeps(ctx, test.Properties.Test_config) + android.ExtractSourceDeps(ctx, test.Properties.Test_config_template) deps = test.testDecorator.linkerDeps(ctx, deps) deps = test.binaryDecorator.linkerDeps(ctx, deps) @@ -234,7 +239,8 @@ func (test *testBinary) linkerFlags(ctx ModuleContext, flags Flags) Flags { func (test *testBinary) install(ctx ModuleContext, file android.Path) { test.data = ctx.ExpandSources(test.Properties.Data, nil) - test.testConfig = tradefed.AutoGenNativeTestConfig(ctx, test.Properties.Test_config) + test.testConfig = tradefed.AutoGenNativeTestConfig(ctx, test.Properties.Test_config, + test.Properties.Test_config_template) test.binaryDecorator.baseInstaller.dir = "nativetest" test.binaryDecorator.baseInstaller.dir64 = "nativetest64" @@ -317,6 +323,10 @@ type BenchmarkProperties struct { // the name of the test configuration (for example "AndroidTest.xml") that should be // installed with the module. Test_config *string `android:"arch_variant"` + + // the name of the test configuration template (for example "AndroidTestTemplate.xml") that + // should be installed with the module. + Test_config_template *string `android:"arch_variant"` } type benchmarkDecorator struct { @@ -344,6 +354,7 @@ func (benchmark *benchmarkDecorator) linkerProps() []interface{} { func (benchmark *benchmarkDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps { android.ExtractSourcesDeps(ctx, benchmark.Properties.Data) android.ExtractSourceDeps(ctx, benchmark.Properties.Test_config) + android.ExtractSourceDeps(ctx, benchmark.Properties.Test_config_template) deps = benchmark.binaryDecorator.linkerDeps(ctx, deps) deps.StaticLibs = append(deps.StaticLibs, "libgoogle-benchmark") @@ -352,7 +363,8 @@ func (benchmark *benchmarkDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps func (benchmark *benchmarkDecorator) install(ctx ModuleContext, file android.Path) { benchmark.data = ctx.ExpandSources(benchmark.Properties.Data, nil) - benchmark.testConfig = tradefed.AutoGenNativeBenchmarkTestConfig(ctx, benchmark.Properties.Test_config) + benchmark.testConfig = tradefed.AutoGenNativeBenchmarkTestConfig(ctx, benchmark.Properties.Test_config, + benchmark.Properties.Test_config_template) benchmark.binaryDecorator.baseInstaller.dir = filepath.Join("benchmarktest", ctx.ModuleName()) benchmark.binaryDecorator.baseInstaller.dir64 = filepath.Join("benchmarktest64", ctx.ModuleName()) diff --git a/java/app.go b/java/app.go index e90c388b7..f8bef1ce8 100644 --- a/java/app.go +++ b/java/app.go @@ -236,12 +236,13 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { a.generateAndroidBuildActions(ctx) - a.testConfig = tradefed.AutoGenInstrumentationTestConfig(ctx, a.testProperties.Test_config, a.manifestPath) + a.testConfig = tradefed.AutoGenInstrumentationTestConfig(ctx, a.testProperties.Test_config, a.testProperties.Test_config_template, a.manifestPath) a.data = ctx.ExpandSources(a.testProperties.Data, nil) } func (a *AndroidTest) DepsMutator(ctx android.BottomUpMutatorContext) { android.ExtractSourceDeps(ctx, a.testProperties.Test_config) + android.ExtractSourceDeps(ctx, a.testProperties.Test_config_template) android.ExtractSourcesDeps(ctx, a.testProperties.Data) a.AndroidApp.DepsMutator(ctx) } diff --git a/java/java.go b/java/java.go index 3332482c3..0bd7857a0 100644 --- a/java/java.go +++ b/java/java.go @@ -1446,6 +1446,10 @@ type testProperties struct { // installed with the module. Test_config *string `android:"arch_variant"` + // the name of the test configuration template (for example "AndroidTestTemplate.xml") that + // should be installed with the module. + Test_config_template *string `android:"arch_variant"` + // list of files or filegroup modules that provide data that should be installed alongside // the test Data []string @@ -1461,7 +1465,7 @@ type Test struct { } func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) { - j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config) + j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template) j.data = ctx.ExpandSources(j.testProperties.Data, nil) j.Library.GenerateAndroidBuildActions(ctx) @@ -1470,6 +1474,7 @@ func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (j *Test) DepsMutator(ctx android.BottomUpMutatorContext) { j.deps(ctx) android.ExtractSourceDeps(ctx, j.testProperties.Test_config) + android.ExtractSourceDeps(ctx, j.testProperties.Test_config_template) android.ExtractSourcesDeps(ctx, j.testProperties.Data) } diff --git a/tradefed/autogen.go b/tradefed/autogen.go index 264e422e7..131fdc44c 100644 --- a/tradefed/autogen.go +++ b/tradefed/autogen.go @@ -22,6 +22,10 @@ import ( "android/soong/android" ) +func getTestConfigTemplate(ctx android.ModuleContext, prop *string) android.OptionalPath { + return ctx.ExpandOptionalSource(prop, "test_config_template") +} + func getTestConfig(ctx android.ModuleContext, prop *string) android.Path { if p := ctx.ExpandOptionalSource(prop, "test_config"); p.Valid() { return p.Path() @@ -41,8 +45,7 @@ func testConfigPath(ctx android.ModuleContext, prop *string) (path android.Path, return p, nil } else if !strings.HasPrefix(ctx.ModuleDir(), "cts/") { outputFile := android.PathForModuleOut(ctx, ctx.ModuleName()+".config") - - return outputFile, outputFile + return nil, outputFile } else { // CTS modules can be used for test data, so test config files must be // explicitly created using AndroidTest.xml @@ -63,59 +66,86 @@ func autogenTemplate(ctx android.ModuleContext, output android.WritablePath, tem }) } -func AutoGenNativeTestConfig(ctx android.ModuleContext, prop *string) android.Path { - path, autogenPath := testConfigPath(ctx, prop) +func AutoGenNativeTestConfig(ctx android.ModuleContext, testConfigProp *string, + testConfigTemplateProp *string) android.Path { + path, autogenPath := testConfigPath(ctx, testConfigProp) if autogenPath != nil { - if ctx.Device() { - autogenTemplate(ctx, autogenPath, "${NativeTestConfigTemplate}") + templatePath := getTestConfigTemplate(ctx, testConfigTemplateProp) + if templatePath.Valid() { + autogenTemplate(ctx, autogenPath, templatePath.String()) } else { - autogenTemplate(ctx, autogenPath, "${NativeHostTestConfigTemplate}") + if ctx.Device() { + autogenTemplate(ctx, autogenPath, "${NativeTestConfigTemplate}") + } else { + autogenTemplate(ctx, autogenPath, "${NativeHostTestConfigTemplate}") + } } + return autogenPath } return path } -func AutoGenNativeBenchmarkTestConfig(ctx android.ModuleContext, prop *string) android.Path { - path, autogenPath := testConfigPath(ctx, prop) +func AutoGenNativeBenchmarkTestConfig(ctx android.ModuleContext, testConfigProp *string, + testConfigTemplateProp *string) android.Path { + path, autogenPath := testConfigPath(ctx, testConfigProp) if autogenPath != nil { - autogenTemplate(ctx, autogenPath, "${NativeBenchmarkTestConfigTemplate}") + templatePath := getTestConfigTemplate(ctx, testConfigTemplateProp) + if templatePath.Valid() { + autogenTemplate(ctx, autogenPath, templatePath.String()) + } else { + autogenTemplate(ctx, autogenPath, "${NativeBenchmarkTestConfigTemplate}") + } + return autogenPath } return path } -func AutoGenJavaTestConfig(ctx android.ModuleContext, prop *string) android.Path { - path, autogenPath := testConfigPath(ctx, prop) +func AutoGenJavaTestConfig(ctx android.ModuleContext, testConfigProp *string, testConfigTemplateProp *string) android.Path { + path, autogenPath := testConfigPath(ctx, testConfigProp) if autogenPath != nil { - if ctx.Device() { - autogenTemplate(ctx, autogenPath, "${JavaTestConfigTemplate}") + templatePath := getTestConfigTemplate(ctx, testConfigTemplateProp) + if templatePath.Valid() { + autogenTemplate(ctx, autogenPath, templatePath.String()) } else { - autogenTemplate(ctx, autogenPath, "${JavaHostTestConfigTemplate}") + if ctx.Device() { + autogenTemplate(ctx, autogenPath, "${JavaTestConfigTemplate}") + } else { + autogenTemplate(ctx, autogenPath, "${JavaHostTestConfigTemplate}") + } } + return autogenPath } return path } var autogenInstrumentationTest = pctx.StaticRule("autogenInstrumentationTest", blueprint.RuleParams{ - Command: "${AutoGenTestConfigScript} $out $in ${EmptyTestConfig} ${InstrumentationTestConfigTemplate}", + Command: "${AutoGenTestConfigScript} $out $in ${EmptyTestConfig} $template", CommandDeps: []string{ "${AutoGenTestConfigScript}", "${EmptyTestConfig}", - "${InstrumentationTestConfigTemplate}", + "$template", }, -}, "name") +}, "name", "template") -func AutoGenInstrumentationTestConfig(ctx android.ModuleContext, prop *string, manifest android.Path) android.Path { - path, autogenPath := testConfigPath(ctx, prop) +func AutoGenInstrumentationTestConfig(ctx android.ModuleContext, testConfigProp *string, testConfigTemplateProp *string, manifest android.Path) android.Path { + path, autogenPath := testConfigPath(ctx, testConfigProp) if autogenPath != nil { + template := "${InstrumentationTestConfigTemplate}" + moduleTemplate := getTestConfigTemplate(ctx, testConfigTemplateProp) + if moduleTemplate.Valid() { + template = moduleTemplate.String() + } ctx.Build(pctx, android.BuildParams{ Rule: autogenInstrumentationTest, Description: "test config", Input: manifest, Output: autogenPath, Args: map[string]string{ - "name": ctx.ModuleName(), + "name": ctx.ModuleName(), + "template": template, }, }) + return autogenPath } return path }