StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TradeFed: Add "test_config_template" flag in Android.bp

Browse Source 
* 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
This commit is contained in:
Jack He
2018-09-19 02:21:28 -07:00
parent ce6b038a55
commit 3333889da5
4 changed files with 73 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
tradefed/autogen.go
View File

@@ -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
}