From 3ae4cca6e10c447eeff52480aa8de7a08c6511c2 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 22 Feb 2022 16:33:24 +0900 Subject: [PATCH] sh_test: Support per-testcase directories Similar to cfb0f5e102e2a4a946c4f6e38d429b132ed11fc5 Bug: n/a Test: add a new CTS sh_test_host module with duplicate 'data'; Change-Id: Ie7d183bb5703d616d61d7dcb7c8b44502de429bb --- sh/sh_binary.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 4190e84b8..d1beaba41 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -149,6 +149,9 @@ type TestProperties struct { // Only available for host sh_test modules. Data_device_libs []string `android:"path,arch_variant"` + // Install the test into a folder named for the module in all test suites. + Per_testcase_directory *bool + // Test options. Test_options TestOptions } @@ -464,6 +467,7 @@ func (s *ShTest) AndroidMkEntries() []android.AndroidMkEntries { if Bool(s.testProperties.Test_options.Unit_test) { entries.SetBool("LOCAL_IS_UNIT_TEST", true) } + entries.SetBoolIfTrue("LOCAL_COMPATIBILITY_PER_TESTCASE_DIRECTORY", Bool(s.testProperties.Per_testcase_directory)) }, }, }}