Add extra_test_configs option

Bug: 163344047
Test: m -j HelloWorldHostTest hello_world_test HelloWorldTests
Change-Id: I237e3aa3f40df1f6387ba8ff6a16e56535cdeae9
This commit is contained in:
Dan Shi
2020-08-15 12:24:26 -07:00
parent 6b6f9dbb7d
commit 95d19422a6
5 changed files with 45 additions and 7 deletions

View File

@@ -40,8 +40,12 @@ type TestProperties struct {
type TestOptions struct {
// The UID that you want to run the test as on a device.
Run_test_as *string
// A list of free-formed strings without spaces that categorize the test.
Test_suite_tag []string
// a list of extra test configuration files that should be installed with the module.
Extra_test_configs []string `android:"path,arch_variant"`
}
type TestBinaryProperties struct {
@@ -309,9 +313,10 @@ type testBinary struct {
testDecorator
*binaryDecorator
*baseCompiler
Properties TestBinaryProperties
data []android.DataPath
testConfig android.Path
Properties TestBinaryProperties
data []android.DataPath
testConfig android.Path
extraTestConfigs android.Paths
}
func (test *testBinary) linkerProps() []interface{} {
@@ -408,6 +413,8 @@ func (test *testBinary) install(ctx ModuleContext, file android.Path) {
test.testConfig = tradefed.AutoGenNativeTestConfig(ctx, test.Properties.Test_config,
test.Properties.Test_config_template, test.Properties.Test_suites, configs, test.Properties.Auto_gen_config)
test.extraTestConfigs = android.PathsForModuleSrc(ctx, test.Properties.Test_options.Extra_test_configs)
test.binaryDecorator.baseInstaller.dir = "nativetest"
test.binaryDecorator.baseInstaller.dir64 = "nativetest64"