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

Merge "Skip device test only configs for auto gen test config" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-02 08:46:56 +00:00
committed by Gerrit Code Review
parent 74a06516ca ad04250dd1
commit e56803d74d
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/test.go
View File

@@ -395,7 +395,7 @@ func (test *testBinary) install(ctx ModuleContext, file android.Path) {
useVendor := ctx.inVendor() || ctx.useVndk() useVendor := ctx.inVendor() || ctx.useVndk()
testInstallBase := getTestInstallBase(useVendor) testInstallBase := getTestInstallBase(useVendor)
configs := getTradefedConfigOptions(ctx, &test.Properties, test.isolated(ctx)) configs := getTradefedConfigOptions(ctx, &test.Properties, test.isolated(ctx), ctx.Device())
test.testConfig = tradefed.AutoGenTestConfig(ctx, tradefed.AutoGenTestConfigOptions{ test.testConfig = tradefed.AutoGenTestConfig(ctx, tradefed.AutoGenTestConfigOptions{
TestConfigProp: test.Properties.Test_config, TestConfigProp: test.Properties.Test_config,
@@ -435,12 +435,13 @@ func getTestInstallBase(useVendor bool) string {
return testInstallBase return testInstallBase
} }
func getTradefedConfigOptions(ctx android.EarlyModuleContext, properties *TestBinaryProperties, isolated bool) []tradefed.Config { func getTradefedConfigOptions(ctx android.EarlyModuleContext, properties *TestBinaryProperties, isolated bool, device bool) []tradefed.Config {
var configs []tradefed.Config var configs []tradefed.Config
for _, module := range properties.Test_mainline_modules { for _, module := range properties.Test_mainline_modules {
configs = append(configs, tradefed.Option{Name: "config-descriptor:metadata", Key: "mainline-param", Value: module}) configs = append(configs, tradefed.Option{Name: "config-descriptor:metadata", Key: "mainline-param", Value: module})
} }
if device {
if Bool(properties.Require_root) { if Bool(properties.Require_root) {
configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.RootTargetPreparer", nil}) configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.RootTargetPreparer", nil})
} else { } else {
@@ -452,6 +453,7 @@ func getTradefedConfigOptions(ctx android.EarlyModuleContext, properties *TestBi
var options []tradefed.Option var options []tradefed.Option
configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.StopServicesSetup", options}) configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.StopServicesSetup", options})
} }
}
if isolated { if isolated {
configs = append(configs, tradefed.Option{Name: "not-shardable", Value: "true"}) configs = append(configs, tradefed.Option{Name: "not-shardable", Value: "true"})
} }
@@ -760,7 +762,7 @@ func testBinaryBp2build(ctx android.TopDownMutatorContext, m *Module) {
p.Auto_gen_config, p.Auto_gen_config,
p.Test_options.Test_suite_tag, p.Test_options.Test_suite_tag,
p.Test_config_template, p.Test_config_template,
getTradefedConfigOptions(ctx, p, gtestIsolated), getTradefedConfigOptions(ctx, p, gtestIsolated, true),
&testInstallBase, &testInstallBase,
) )
testBinaryAttrs.TestConfigAttributes = testConfigAttributes testBinaryAttrs.TestConfigAttributes = testConfigAttributes