diff options
author | Jack He <siyuanh@google.com> | 2018-09-19 02:21:28 -0700 |
---|---|---|
committer | Jack He <siyuanh@google.com> | 2018-09-26 18:02:55 -0700 |
commit | 3333889da5b31132fef90848b7630e1b2e793363 (patch) | |
tree | 3a2e35b06d99246e3f47b8c859f28a8dc0407792 /tradefed | |
parent | ce6b038a5504f7ff4c242367d36904400893c7d7 (diff) | |
download | build_soong-3333889da5b31132fef90848b7630e1b2e793363.tar.gz build_soong-3333889da5b31132fef90848b7630e1b2e793363.tar.bz2 build_soong-3333889da5b31132fef90848b7630e1b2e793363.zip |
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
Diffstat (limited to 'tradefed')
-rw-r--r-- | tradefed/autogen.go | 72 |
1 files changed, 51 insertions, 21 deletions
diff --git a/tradefed/autogen.go b/tradefed/autogen.go index 264e422e..131fdc44 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 } |