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

Commit dc9369ef authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Generate tradefed config for rust device tests."

parents 4d2eeed0 ede57ae8

rust/androidmk.go

+1 −5
Original line number Diff line number Diff line
@@ -90,11 +90,7 @@ func (binary *binaryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.Andr 
func (test *testDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {

	test.binaryDecorator.AndroidMk(ctx, ret)

	ret.Class = "NATIVE_TESTS"

	stem := String(test.baseCompiler.Properties.Stem)

	if stem != "" && !strings.HasSuffix(ctx.Name(), "_"+stem) {

		// Avoid repeated suffix in the module name.

		ret.SubName = "_" + stem

	}

	ret.SubName = test.getMutatedModuleSubName(ctx.Name())

	ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {

		if len(test.Properties.Test_suites) > 0 {

			fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",

rust/test.go

+19 −6
Original line number Diff line number Diff line
@@ -69,15 +69,28 @@ func (test *testDecorator) compilerProps() []interface{} { 
	return append(test.binaryDecorator.compilerProps(), &test.Properties)

}



func (test *testDecorator) getMutatedModuleSubName(moduleName string) string {

	stem := String(test.baseCompiler.Properties.Stem)

	if stem != "" && !strings.HasSuffix(moduleName, "_"+stem) {

		// Avoid repeated suffix in the module name.

		return "_" + stem

	}

	return ""

}



func (test *testDecorator) install(ctx ModuleContext, file android.Path) {

	name := ctx.ModuleName() // default executable name

	if ctx.Device() {        // on device, use mutated module name

		name = name + test.getMutatedModuleSubName(name)

	} else { // on host, use stem name in relative_install_path

		if stem := String(test.baseCompiler.Properties.Stem); stem != "" {

			name = stem

		}

		if path := test.baseCompiler.relativeInstallPath(); path != "" {

			name = path + "/" + name

		}

	test.testConfig = tradefed.AutoGenRustHostTestConfig(ctx, name,

	}

	test.testConfig = tradefed.AutoGenRustTestConfig(ctx, name,

		test.Properties.Test_config,

		test.Properties.Test_config_template,

		test.Properties.Test_suites,

tradefed/autogen.go

+4 −1
Original line number Diff line number Diff line
@@ -197,11 +197,14 @@ func AutoGenPythonBinaryHostTestConfig(ctx android.ModuleContext, testConfigProp 
	return path

}



func AutoGenRustHostTestConfig(ctx android.ModuleContext, name string, testConfigProp *string,

func AutoGenRustTestConfig(ctx android.ModuleContext, name string, testConfigProp *string,

	testConfigTemplateProp *string, testSuites []string, autoGenConfig *bool) android.Path {

	path, autogenPath := testConfigPath(ctx, testConfigProp, testSuites, autoGenConfig)

	if autogenPath != nil {

		templatePathString := "${RustHostTestConfigTemplate}"

		if ctx.Device() {

			templatePathString = "${RustDeviceTestConfigTemplate}"

		}

		templatePath := getTestConfigTemplate(ctx, testConfigTemplateProp)

		if templatePath.Valid() {

			templatePathString = templatePath.String()

tradefed/config.go

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ func init() { 
	pctx.SourcePathVariable("NativeHostTestConfigTemplate", "build/make/core/native_host_test_config_template.xml")

	pctx.SourcePathVariable("NativeTestConfigTemplate", "build/make/core/native_test_config_template.xml")

	pctx.SourcePathVariable("PythonBinaryHostTestConfigTemplate", "build/make/core/python_binary_host_test_config_template.xml")

	pctx.SourcePathVariable("RustDeviceTestConfigTemplate", "build/make/core/rust_device_test_config_template.xml")

	pctx.SourcePathVariable("RustHostTestConfigTemplate", "build/make/core/rust_host_test_config_template.xml")



	pctx.SourcePathVariable("EmptyTestConfig", "build/make/core/empty_test_config.xml")

tradefed/makevars.go

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) { 
	ctx.Strict("NATIVE_HOST_TEST_CONFIG_TEMPLATE", "${NativeHostTestConfigTemplate}")

	ctx.Strict("NATIVE_TEST_CONFIG_TEMPLATE", "${NativeTestConfigTemplate}")

	ctx.Strict("PYTHON_BINARY_HOST_TEST_CONFIG_TEMPLATE", "${PythonBinaryHostTestConfigTemplate}")

	ctx.Strict("RUST_DEVICE_TEST_CONFIG_TEMPLATE", "${RustDeviceTestConfigTemplate}")

	ctx.Strict("RUST_HOST_TEST_CONFIG_TEMPLATE", "${RustHostTestConfigTemplate}")



	ctx.Strict("EMPTY_TEST_CONFIG", "${EmptyTestConfig}")