From 4bbf86f4f0eebd3df96af7c2ab5049f8730a7768 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 30 Nov 2023 09:29:50 -0700 Subject: [PATCH] Include Ravenwood tests in `general-tests`. EngProd has indicated that we need to be included in that suite to support TEST_MAPPING files in their infrastructure. Bug: 308854804 Test: TH Merged-in: I763b033f0f5f275091db45ab62df6af48dcddc66 Change-Id: I763b033f0f5f275091db45ab62df6af48dcddc66 --- java/ravenwood.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/java/ravenwood.go b/java/ravenwood.go index 85f64a86c..e36200307 100644 --- a/java/ravenwood.go +++ b/java/ravenwood.go @@ -53,7 +53,10 @@ func ravenwoodTestFactory() android.Module { module.Module.dexpreopter.isTest = 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) InitJavaModule(module, android.DeviceSupported) @@ -123,7 +126,8 @@ func (r *ravenwoodTest) AndroidMkEntries() []android.AndroidMkEntries { entries.ExtraEntries = append(entries.ExtraEntries, func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { 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 { 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 } func (r *ravenwoodLibgroup) TestSuites() []string { - return []string{"ravenwood-tests"} + return []string{ + "general-tests", + "ravenwood-tests", + } } func (r *ravenwoodLibgroup) DepsMutator(ctx android.BottomUpMutatorContext) {