tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Include Ravenwood tests in general-tests.

Browse source 
EngProd has indicated that we need to be included in that suite to
support TEST_MAPPING files in their infrastructure.

Bug: 308854804
Test: TH
Change-Id: I763b033f0f5f275091db45ab62df6af48dcddc66
This commit is contained in:
Jeff Sharkey 2023-11-30 09:29:50 -07:00
parent efe237c8bf
commit 7a19abf260
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
java/ravenwood.go
View file

@ -53,7 +53,10 @@ func ravenwoodTestFactory() android.Module {
module.Module.dexpreopter.isTest = true module.Module.dexpreopter.isTest = true
module.Module.linter.properties.Lint.Test = proptools.BoolPtr(true) module.Module.linter.properties.Lint.Test = proptools.BoolPtr(true)
module.testProperties.Test_suites = []string{"ravenwood-tests"} module.testProperties.Test_suites = []string{
"general-tests",
"ravenwood-tests",
}
module.testProperties.Test_options.Unit_test = proptools.BoolPtr(false) module.testProperties.Test_options.Unit_test = proptools.BoolPtr(false)
InitJavaModule(module, android.DeviceSupported) InitJavaModule(module, android.DeviceSupported)
@ -123,7 +126,8 @@ func (r *ravenwoodTest) AndroidMkEntries() []android.AndroidMkEntries {
entries.ExtraEntries = append(entries.ExtraEntries, entries.ExtraEntries = append(entries.ExtraEntries,
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", true) entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", true)
entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", "ravenwood-tests") entries.AddStrings("LOCAL_COMPATIBILITY_SUITE",
"general-tests", "ravenwood-tests")
if r.testConfig != nil { if r.testConfig != nil {
entries.SetPath("LOCAL_FULL_TEST_CONFIG", r.testConfig) entries.SetPath("LOCAL_FULL_TEST_CONFIG", r.testConfig)
} }
@ -157,7 +161,10 @@ func (r *ravenwoodLibgroup) InstallForceOS() (*android.OsType, *android.ArchType
return &r.forceOSType, &r.forceArchType return &r.forceOSType, &r.forceArchType
} }
func (r *ravenwoodLibgroup) TestSuites() []string { func (r *ravenwoodLibgroup) TestSuites() []string {
return []string{"ravenwood-tests"} return []string{
"general-tests",
"ravenwood-tests",
}
} }
func (r *ravenwoodLibgroup) DepsMutator(ctx android.BottomUpMutatorContext) { func (r *ravenwoodLibgroup) DepsMutator(ctx android.BottomUpMutatorContext) {