openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cc/test.go
View File

@ -49,6 +49,10 @@ type TestBinaryProperties struct {
// the name of the test configuration (for example "AndroidTest.xml") that should be // the name of the test configuration (for example "AndroidTest.xml") that should be
// installed with the module. // installed with the module.
Test_config *string `android:"arch_variant"` 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() { func init() {
@ -220,6 +224,7 @@ func (test *testBinary) linkerInit(ctx BaseModuleContext) {
func (test *testBinary) linkerDeps(ctx DepsContext, deps Deps) Deps { func (test *testBinary) linkerDeps(ctx DepsContext, deps Deps) Deps {
android.ExtractSourcesDeps(ctx, test.Properties.Data) android.ExtractSourcesDeps(ctx, test.Properties.Data)
android.ExtractSourceDeps(ctx, test.Properties.Test_config) android.ExtractSourceDeps(ctx, test.Properties.Test_config)
android.ExtractSourceDeps(ctx, test.Properties.Test_config_template)
deps = test.testDecorator.linkerDeps(ctx, deps) deps = test.testDecorator.linkerDeps(ctx, deps)
deps = test.binaryDecorator.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) { func (test *testBinary) install(ctx ModuleContext, file android.Path) {
test.data = ctx.ExpandSources(test.Properties.Data, nil) 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.dir = "nativetest"
test.binaryDecorator.baseInstaller.dir64 = "nativetest64" 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 // the name of the test configuration (for example "AndroidTest.xml") that should be
// installed with the module. // installed with the module.
Test_config *string `android:"arch_variant"` 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 { type benchmarkDecorator struct {
@ -344,6 +354,7 @@ func (benchmark *benchmarkDecorator) linkerProps() []interface{} {
func (benchmark *benchmarkDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps { func (benchmark *benchmarkDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps {
android.ExtractSourcesDeps(ctx, benchmark.Properties.Data) android.ExtractSourcesDeps(ctx, benchmark.Properties.Data)
android.ExtractSourceDeps(ctx, benchmark.Properties.Test_config) android.ExtractSourceDeps(ctx, benchmark.Properties.Test_config)
android.ExtractSourceDeps(ctx, benchmark.Properties.Test_config_template)
deps = benchmark.binaryDecorator.linkerDeps(ctx, deps) deps = benchmark.binaryDecorator.linkerDeps(ctx, deps)
deps.StaticLibs = append(deps.StaticLibs, "libgoogle-benchmark") 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) { func (benchmark *benchmarkDecorator) install(ctx ModuleContext, file android.Path) {
benchmark.data = ctx.ExpandSources(benchmark.Properties.Data, nil) 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.dir = filepath.Join("benchmarktest", ctx.ModuleName())
benchmark.binaryDecorator.baseInstaller.dir64 = filepath.Join("benchmarktest64", ctx.ModuleName()) benchmark.binaryDecorator.baseInstaller.dir64 = filepath.Join("benchmarktest64", ctx.ModuleName())

3
java/app.go
View File

@ -236,12 +236,13 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.generateAndroidBuildActions(ctx) 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) a.data = ctx.ExpandSources(a.testProperties.Data, nil)
} }
func (a *AndroidTest) DepsMutator(ctx android.BottomUpMutatorContext) { func (a *AndroidTest) DepsMutator(ctx android.BottomUpMutatorContext) {
android.ExtractSourceDeps(ctx, a.testProperties.Test_config) android.ExtractSourceDeps(ctx, a.testProperties.Test_config)
android.ExtractSourceDeps(ctx, a.testProperties.Test_config_template)
android.ExtractSourcesDeps(ctx, a.testProperties.Data) android.ExtractSourcesDeps(ctx, a.testProperties.Data)
a.AndroidApp.DepsMutator(ctx) a.AndroidApp.DepsMutator(ctx)
} }

7
java/java.go
View File

@ -1446,6 +1446,10 @@ type testProperties struct {
// installed with the module. // installed with the module.
Test_config *string `android:"arch_variant"` 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 // list of files or filegroup modules that provide data that should be installed alongside
// the test // the test
Data []string Data []string
@ -1461,7 +1465,7 @@ type Test struct {
} }
func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) { 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.data = ctx.ExpandSources(j.testProperties.Data, nil)
j.Library.GenerateAndroidBuildActions(ctx) j.Library.GenerateAndroidBuildActions(ctx)
@ -1470,6 +1474,7 @@ func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) {
func (j *Test) DepsMutator(ctx android.BottomUpMutatorContext) { func (j *Test) DepsMutator(ctx android.BottomUpMutatorContext) {
j.deps(ctx) j.deps(ctx)
android.ExtractSourceDeps(ctx, j.testProperties.Test_config) android.ExtractSourceDeps(ctx, j.testProperties.Test_config)
android.ExtractSourceDeps(ctx, j.testProperties.Test_config_template)
android.ExtractSourcesDeps(ctx, j.testProperties.Data) android.ExtractSourcesDeps(ctx, j.testProperties.Data)
} }

72
tradefed/autogen.go
View File

@ -22,6 +22,10 @@ import (
"android/soong/android" "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 { func getTestConfig(ctx android.ModuleContext, prop *string) android.Path {
if p := ctx.ExpandOptionalSource(prop, "test_config"); p.Valid() { if p := ctx.ExpandOptionalSource(prop, "test_config"); p.Valid() {
return p.Path() return p.Path()
@ -41,8 +45,7 @@ func testConfigPath(ctx android.ModuleContext, prop *string) (path android.Path,
return p, nil return p, nil
} else if !strings.HasPrefix(ctx.ModuleDir(), "cts/") { } else if !strings.HasPrefix(ctx.ModuleDir(), "cts/") {
outputFile := android.PathForModuleOut(ctx, ctx.ModuleName()+".config") outputFile := android.PathForModuleOut(ctx, ctx.ModuleName()+".config")
return nil, outputFile
return outputFile, outputFile
} else { } else {
// CTS modules can be used for test data, so test config files must be // CTS modules can be used for test data, so test config files must be
// explicitly created using AndroidTest.xml // 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 { func AutoGenNativeTestConfig(ctx android.ModuleContext, testConfigProp *string,
path, autogenPath := testConfigPath(ctx, prop) testConfigTemplateProp *string) android.Path {
path, autogenPath := testConfigPath(ctx, testConfigProp)
if autogenPath != nil { if autogenPath != nil {
if ctx.Device() { templatePath := getTestConfigTemplate(ctx, testConfigTemplateProp)
autogenTemplate(ctx, autogenPath, "${NativeTestConfigTemplate}") if templatePath.Valid() {
autogenTemplate(ctx, autogenPath, templatePath.String())
} else { } else {
autogenTemplate(ctx, autogenPath, "${NativeHostTestConfigTemplate}") if ctx.Device() {
autogenTemplate(ctx, autogenPath, "${NativeTestConfigTemplate}")
} else {
autogenTemplate(ctx, autogenPath, "${NativeHostTestConfigTemplate}")
}
} }
return autogenPath
} }
return path return path
} }
func AutoGenNativeBenchmarkTestConfig(ctx android.ModuleContext, prop *string) android.Path { func AutoGenNativeBenchmarkTestConfig(ctx android.ModuleContext, testConfigProp *string,
path, autogenPath := testConfigPath(ctx, prop) testConfigTemplateProp *string) android.Path {
path, autogenPath := testConfigPath(ctx, testConfigProp)
if autogenPath != nil { 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 return path
} }
func AutoGenJavaTestConfig(ctx android.ModuleContext, prop *string) android.Path { func AutoGenJavaTestConfig(ctx android.ModuleContext, testConfigProp *string, testConfigTemplateProp *string) android.Path {
path, autogenPath := testConfigPath(ctx, prop) path, autogenPath := testConfigPath(ctx, testConfigProp)
if autogenPath != nil { if autogenPath != nil {
if ctx.Device() { templatePath := getTestConfigTemplate(ctx, testConfigTemplateProp)
autogenTemplate(ctx, autogenPath, "${JavaTestConfigTemplate}") if templatePath.Valid() {
autogenTemplate(ctx, autogenPath, templatePath.String())
} else { } else {
autogenTemplate(ctx, autogenPath, "${JavaHostTestConfigTemplate}") if ctx.Device() {
autogenTemplate(ctx, autogenPath, "${JavaTestConfigTemplate}")
} else {
autogenTemplate(ctx, autogenPath, "${JavaHostTestConfigTemplate}")
}
} }
return autogenPath
} }
return path return path
} }
var autogenInstrumentationTest = pctx.StaticRule("autogenInstrumentationTest", blueprint.RuleParams{ var autogenInstrumentationTest = pctx.StaticRule("autogenInstrumentationTest", blueprint.RuleParams{
Command: "${AutoGenTestConfigScript} $out $in ${EmptyTestConfig} ${InstrumentationTestConfigTemplate}", Command: "${AutoGenTestConfigScript} $out $in ${EmptyTestConfig} $template",
CommandDeps: []string{ CommandDeps: []string{
"${AutoGenTestConfigScript}", "${AutoGenTestConfigScript}",
"${EmptyTestConfig}", "${EmptyTestConfig}",
"${InstrumentationTestConfigTemplate}", "$template",
}, },
}, "name") }, "name", "template")
func AutoGenInstrumentationTestConfig(ctx android.ModuleContext, prop *string, manifest android.Path) android.Path { func AutoGenInstrumentationTestConfig(ctx android.ModuleContext, testConfigProp *string, testConfigTemplateProp *string, manifest android.Path) android.Path {
path, autogenPath := testConfigPath(ctx, prop) path, autogenPath := testConfigPath(ctx, testConfigProp)
if autogenPath != nil { if autogenPath != nil {
template := "${InstrumentationTestConfigTemplate}"
moduleTemplate := getTestConfigTemplate(ctx, testConfigTemplateProp)
if moduleTemplate.Valid() {
template = moduleTemplate.String()
}
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: autogenInstrumentationTest, Rule: autogenInstrumentationTest,
Description: "test config", Description: "test config",
Input: manifest, Input: manifest,
Output: autogenPath, Output: autogenPath,
Args: map[string]string{ Args: map[string]string{
"name": ctx.ModuleName(), "name": ctx.ModuleName(),
"template": template,
}, },
}) })
return autogenPath
} }
return path return path
} }