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

Commit ebb51503 authored by Dan Shi's avatar Dan Shi Committed by Gerrit Code Review
Browse files

Merge "Add unit_test test option in test configs"

parents 6d41e995 d79572f7

androidmk/androidmk/android.go

+2 −0
Original line number Diff line number Diff line
@@ -214,6 +214,8 @@ func init() { 


			"LOCAL_PRIVATE_PLATFORM_APIS": "platform_apis",

			"LOCAL_JETIFIER_ENABLED":      "jetifier",



			"LOCAL_IS_UNIT_TEST": "unit_test",

		})

}

cc/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -370,6 +370,9 @@ func (test *testBinary) AndroidMkEntries(ctx AndroidMkContext, entries *android. 
			entries.SetBool("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", true)

		}

		entries.AddStrings("LOCAL_TEST_MAINLINE_MODULES", test.Properties.Test_mainline_modules...)

		if Bool(test.Properties.Test_options.Unit_test) {

			entries.SetBool("LOCAL_IS_UNIT_TEST", true)

		}

	})



	androidMkWriteTestData(test.data, ctx, entries)

cc/test.go

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ type TestOptions struct { 


	// a list of extra test configuration files that should be installed with the module.

	Extra_test_configs []string `android:"path,arch_variant"`



	// If the test is a hostside(no device required) unittest that shall be run during presubmit check.

	Unit_test *bool

}



type TestBinaryProperties struct {

java/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ func (j *Test) AndroidMkEntries() []android.AndroidMkEntries { 
			entries.SetString("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", "true")

		}

		entries.AddStrings("LOCAL_TEST_MAINLINE_MODULES", j.testProperties.Test_mainline_modules...)

		if Bool(j.testProperties.Test_options.Unit_test) {

			entries.SetBool("LOCAL_IS_UNIT_TEST", true)

		}

	})



	return entriesList

java/java.go

+3 −0
Original line number Diff line number Diff line
@@ -2226,6 +2226,9 @@ func LibraryHostFactory() android.Module { 
type TestOptions struct {

	// a list of extra test configuration files that should be installed with the module.

	Extra_test_configs []string `android:"path,arch_variant"`



	// If the test is a hostside(no device required) unittest that shall be run during presubmit check.

	Unit_test *bool

}



type testProperties struct {