Merge "sh_test: Support per-testcase directories" am: 62192b883b

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1994090

Change-Id: I5cbaa43f0945c4539794323f0f7d749801c34fe8
This commit is contained in:
Jooyung Han
2022-02-23 16:56:03 +00:00
committed by Automerger Merge Worker

View File

@@ -149,6 +149,9 @@ type TestProperties struct {
// Only available for host sh_test modules. // Only available for host sh_test modules.
Data_device_libs []string `android:"path,arch_variant"` 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.
Test_options TestOptions Test_options TestOptions
} }
@@ -464,6 +467,7 @@ func (s *ShTest) AndroidMkEntries() []android.AndroidMkEntries {
if Bool(s.testProperties.Test_options.Unit_test) { if Bool(s.testProperties.Test_options.Unit_test) {
entries.SetBool("LOCAL_IS_UNIT_TEST", true) entries.SetBool("LOCAL_IS_UNIT_TEST", true)
} }
entries.SetBoolIfTrue("LOCAL_COMPATIBILITY_PER_TESTCASE_DIRECTORY", Bool(s.testProperties.Per_testcase_directory))
}, },
}, },
}} }}