Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fc6040e authored by yelinhsieh's avatar yelinhsieh Committed by Colin Cross
Browse files

ATest: GTest auto gen config support run_test_as in Android.bp . 

Feature request from developer, support setting uid in Android.bp.

This relands I5604af5f20c45728d19f4c01396a20a74997f8a8 on top of
I2210c15b84f9b30e1cc23b426d463b34cf9ef94f.

Bug: 113359343

Test: source build/envsetup.sh ; lunch
    vim platform_testing/tests/example/native/Android.bp
    add
    test_options: {
        run_test_as: "1234",
    },
    in cc_test
    make hello_world_test
    cat out/target/product/xxxx/testcases/hello_world_test/hello_world_test.config
    Will see  <option name="run-test-as" value="1234" />
    below <test class="com.android.tradefed.testtype.GTest" >

Change-Id: I0b167c44c00ff0eab51443fc93dd8fa2abbe54cf
parent 66f2e870

cc/test.go

+14 −0
Original line number Diff line number Diff line
@@ -30,6 +30,12 @@ type TestProperties struct { 
	Isolated *bool

}



// Test option struct.

type TestOptions struct {

	// The UID that you want to run the test as on a device.

	Run_test_as *string

}



type TestBinaryProperties struct {

	// Create a separate binary for each source file.  Useful when there is

	// global state that can not be torn down and reset between each test suite.
@@ -55,6 +61,9 @@ type TestBinaryProperties struct { 
	// the name of the test configuration template (for example "AndroidTestTemplate.xml") that

	// should be installed with the module.

	Test_config_template *string `android:"path,arch_variant"`



	// Test options.

	Test_options TestOptions

}



func init() {
@@ -258,6 +267,11 @@ func (test *testBinary) install(ctx ModuleContext, file android.Path) { 
	if Bool(test.testDecorator.Properties.Isolated) {

		optionsMap["not-shardable"] = "true"

	}



	if test.Properties.Test_options.Run_test_as != nil {

		optionsMap["run-test-as"] = String(test.Properties.Test_options.Run_test_as)

	}



	test.testConfig = tradefed.AutoGenNativeTestConfig(ctx, test.Properties.Test_config,

		test.Properties.Test_config_template,

		test.Properties.Test_suites, optionsMap)