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

Commit 4bbf86f4 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Makoto Onuki
Browse files

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
parent ddb5152a

java/ravenwood.go

+10 −3
Original line number Diff line number Diff line
@@ -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) {