From 519db27d98930c01c1e591f674c88cdf77d74823 Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Thu, 18 Jun 2020 18:07:00 +0100 Subject: [PATCH] Add test-suite-tag to test_options Bug: 147817558 Test: Check the generated config file Change-Id: I679dc7b4a582486ac61380a7e42f1373534d7086 --- cc/test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cc/test.go b/cc/test.go index 2439c9465..09da97602 100644 --- a/cc/test.go +++ b/cc/test.go @@ -40,6 +40,8 @@ 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 } type TestBinaryProperties struct { @@ -357,6 +359,9 @@ func (test *testBinary) install(ctx ModuleContext, file android.Path) { if test.Properties.Test_options.Run_test_as != nil { configs = append(configs, tradefed.Option{Name: "run-test-as", Value: String(test.Properties.Test_options.Run_test_as)}) } + for _, tag := range test.Properties.Test_options.Test_suite_tag { + configs = append(configs, tradefed.Option{Name: "test-suite-tag", Value: tag}) + } if test.Properties.Test_min_api_level != nil && test.Properties.Test_min_sdk_version != nil { ctx.PropertyErrorf("test_min_api_level", "'test_min_api_level' and 'test_min_sdk_version' should not be set at the same time.") } else if test.Properties.Test_min_api_level != nil {