Autogenerate some extra_options based on some build properties
If an Android.bp specifies Isolated=true, make sure
it's tagged as not-shardable, since b/126376458 is not
resolved.
Test: make bionic-benchmarks-tests (with and without isolated=true)
Bug: 124024827
Change-Id: I2210c15b84f9b30e1cc23b426d463b34cf9ef94f
diff --git a/cc/test.go b/cc/test.go
index e9f0944..8e49fac 100644
--- a/cc/test.go
+++ b/cc/test.go
@@ -243,8 +243,13 @@
func (test *testBinary) install(ctx ModuleContext, file android.Path) {
test.data = ctx.ExpandSources(test.Properties.Data, nil)
+ optionsMap := map[string]string{}
+ if Bool(test.testDecorator.Properties.Isolated) {
+ optionsMap["not-shardable"] = "true"
+ }
test.testConfig = tradefed.AutoGenNativeTestConfig(ctx, test.Properties.Test_config,
- test.Properties.Test_config_template, test.Properties.Test_suites)
+ test.Properties.Test_config_template,
+ test.Properties.Test_suites, optionsMap)
test.binaryDecorator.baseInstaller.dir = "nativetest"
test.binaryDecorator.baseInstaller.dir64 = "nativetest64"
diff --git a/tradefed/autogen.go b/tradefed/autogen.go
index cfa7164..6d9c200 100644
--- a/tradefed/autogen.go
+++ b/tradefed/autogen.go
@@ -15,7 +15,12 @@
package tradefed
import (
+ "fmt"
+ "sort"
+ "strings"
+
"github.com/google/blueprint"
+ "github.com/google/blueprint/proptools"
"android/soong/android"
)
@@ -34,9 +39,9 @@
}
var autogenTestConfig = pctx.StaticRule("autogenTestConfig", blueprint.RuleParams{
- Command: "sed 's&{MODULE}&${name}&g' $template > $out",
+ Command: "sed 's&{MODULE}&${name}&g;s&{EXTRA_OPTIONS}&'${extraOptions}'&g' $template > $out",
CommandDeps: []string{"$template"},
-}, "name", "template")
+}, "name", "template", "extraOptions")
func testConfigPath(ctx android.ModuleContext, prop *string, testSuites []string) (path android.Path, autogenPath android.WritablePath) {
if p := getTestConfig(ctx, prop); p != nil {
@@ -52,30 +57,45 @@
}
}
-func autogenTemplate(ctx android.ModuleContext, output android.WritablePath, template string) {
+func autogenTemplate(ctx android.ModuleContext, output android.WritablePath, template string, optionsMap map[string]string) {
+ // If no test option found, delete {EXTRA_OPTIONS} line.
+ var options []string
+ for optionName, value := range optionsMap {
+ if value != "" {
+ options = append(options, fmt.Sprintf(`<option name="%s" value="%s" />`, optionName, value))
+ }
+ }
+ sort.Strings(options)
+ extraOptions := strings.Join(options, "\n ")
+ extraOptions = proptools.NinjaAndShellEscape([]string{extraOptions})[0]
+
ctx.Build(pctx, android.BuildParams{
Rule: autogenTestConfig,
Description: "test config",
Output: output,
Args: map[string]string{
- "name": ctx.ModuleName(),
- "template": template,
+ "name": ctx.ModuleName(),
+ "template": template,
+ "extraOptions": extraOptions,
},
})
}
func AutoGenNativeTestConfig(ctx android.ModuleContext, testConfigProp *string,
- testConfigTemplateProp *string, testSuites []string) android.Path {
+ testConfigTemplateProp *string, testSuites []string,
+ optionsMap map[string]string) android.Path {
path, autogenPath := testConfigPath(ctx, testConfigProp, testSuites)
if autogenPath != nil {
templatePath := getTestConfigTemplate(ctx, testConfigTemplateProp)
if templatePath.Valid() {
- autogenTemplate(ctx, autogenPath, templatePath.String())
+ autogenTemplate(ctx, autogenPath, templatePath.String(), optionsMap)
} else {
if ctx.Device() {
- autogenTemplate(ctx, autogenPath, "${NativeTestConfigTemplate}")
+ autogenTemplate(ctx, autogenPath, "${NativeTestConfigTemplate}",
+ optionsMap)
} else {
- autogenTemplate(ctx, autogenPath, "${NativeHostTestConfigTemplate}")
+ autogenTemplate(ctx, autogenPath, "${NativeHostTestConfigTemplate}",
+ optionsMap)
}
}
return autogenPath
@@ -89,9 +109,9 @@
if autogenPath != nil {
templatePath := getTestConfigTemplate(ctx, testConfigTemplateProp)
if templatePath.Valid() {
- autogenTemplate(ctx, autogenPath, templatePath.String())
+ autogenTemplate(ctx, autogenPath, templatePath.String(), nil)
} else {
- autogenTemplate(ctx, autogenPath, "${NativeBenchmarkTestConfigTemplate}")
+ autogenTemplate(ctx, autogenPath, "${NativeBenchmarkTestConfigTemplate}", nil)
}
return autogenPath
}
@@ -103,12 +123,12 @@
if autogenPath != nil {
templatePath := getTestConfigTemplate(ctx, testConfigTemplateProp)
if templatePath.Valid() {
- autogenTemplate(ctx, autogenPath, templatePath.String())
+ autogenTemplate(ctx, autogenPath, templatePath.String(), nil)
} else {
if ctx.Device() {
- autogenTemplate(ctx, autogenPath, "${JavaTestConfigTemplate}")
+ autogenTemplate(ctx, autogenPath, "${JavaTestConfigTemplate}", nil)
} else {
- autogenTemplate(ctx, autogenPath, "${JavaHostTestConfigTemplate}")
+ autogenTemplate(ctx, autogenPath, "${JavaHostTestConfigTemplate}", nil)
}
}
return autogenPath
@@ -123,9 +143,9 @@
if autogenPath != nil {
templatePath := getTestConfigTemplate(ctx, testConfigTemplateProp)
if templatePath.Valid() {
- autogenTemplate(ctx, autogenPath, templatePath.String())
+ autogenTemplate(ctx, autogenPath, templatePath.String(), nil)
} else {
- autogenTemplate(ctx, autogenPath, "${PythonBinaryHostTestConfigTemplate}")
+ autogenTemplate(ctx, autogenPath, "${PythonBinaryHostTestConfigTemplate}", nil)
}
return autogenPath
}