Merge "Migrate options in TEST_MAPPING -> Android.bp" into main (24a25806) · Commits · e / os / android_frameworks_base

services/tests/servicestests/Android.bp

+86 −0

Original line number	Diff line number	Diff line
		@@ -255,3 +255,89 @@ java_genrule {
		"done && " +
		"$(location soong_zip) -o $(out) -C $(genDir)/res -D $(genDir)/res",
		}

		FLAKY_AND_IGNORED = [
		"androidx.test.filters.FlakyTest",
		"org.junit.Ignore",
		]
		// Used by content protection TEST_MAPPING
		test_module_config {
		name: "FrameworksServicesTests_contentprotection",
		base: "FrameworksServicesTests",
		test_suites: ["general-tests"],
		include_filters: ["com.android.server.contentprotection"],
		exclude_annotations: FLAKY_AND_IGNORED,
		}

		test_module_config {
		name: "FrameworksServicesTests_om",
		base: "FrameworksServicesTests",
		test_suites: ["general-tests"],
		include_filters: ["com.android.server.om."],
		exclude_annotations: FLAKY_AND_IGNORED,
		}

		// Used by contexthub TEST_MAPPING
		test_module_config {
		name: "FrameworksServicesTests_contexthub_presubmit",
		base: "FrameworksServicesTests",
		test_suites: ["general-tests"],
		include_filters: ["com.android.server.location.contexthub."],
		// TODO(ron): are these right, does it run anything?
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		exclude_annotations: FLAKY_AND_IGNORED,
		}

		test_module_config {
		name: "FrameworksServicesTests_contexthub_postsubmit",
		base: "FrameworksServicesTests",
		test_suites: ["general-tests"],
		include_filters: ["com.android.server.location.contexthub."],
		// TODO(ron): are these right, does it run anything?
		include_annotations: ["android.platform.test.annotations.Postsubmit"],
		exclude_annotations: FLAKY_AND_IGNORED,
		}

		// Used by contentcapture
		test_module_config {
		name: "FrameworksServicesTests_contentcapture",
		base: "FrameworksServicesTests",
		test_suites: ["general-tests"],
		include_filters: ["com.android.server.contentcapture"],
		exclude_annotations: FLAKY_AND_IGNORED,
		}

		test_module_config {
		name: "FrameworksServicesTests_recoverysystem",
		base: "FrameworksServicesTests",
		test_suites: ["general-tests"],
		include_filters: ["com.android.server.recoverysystem."],
		exclude_annotations: ["androidx.test.filters.FlakyTest"],
		}

		// server pm TEST_MAPPING
		test_module_config {
		name: "FrameworksServicesTests_pm_presubmit",
		base: "FrameworksServicesTests",
		test_suites: ["general-tests"],
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		include_filters: ["com.android.server.pm."],
		exclude_annotations: FLAKY_AND_IGNORED,
		}

		test_module_config {
		name: "FrameworksServicesTests_pm_postsubmit",
		base: "FrameworksServicesTests",
		test_suites: ["general-tests"],
		include_annotations: ["android.platform.test.annotations.Postsubmit"],
		include_filters: ["com.android.server.pm."],
		exclude_annotations: FLAKY_AND_IGNORED,
		}

		// server os TEST_MAPPING
		test_module_config {
		name: "FrameworksServicesTests_os",
		base: "FrameworksServicesTests",
		test_suites: ["general-tests"],
		include_filters: ["com.android.server.os."],
		}

services/tests/servicestests/src/com/android/server/contentcapture/TEST_MAPPING

+6 −0

Original line number	Diff line number	Diff line
		@@ -14,5 +14,11 @@
		}
		]
		}
		],
		"postsubmit": [
		{
		// b/331020193, Move to presubmit early april 2024
		"name": "FrameworksServicesTests_contentcapture"
		}
		]
		}

services/tests/servicestests/src/com/android/server/contentprotection/TEST_MAPPING

+6 −0

Original line number	Diff line number	Diff line
		@@ -14,5 +14,11 @@
		}
		]
		}
		],
		"postsubmit": [
		{
		// b/331020193, Move to presubmit early april 2024
		"name": "FrameworksServicesTests_contentprotection"
		}
		]
		}

services/tests/servicestests/src/com/android/server/location/contexthub/TEST_MAPPING

+6 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,10 @@
		}
		],
		"postsubmit": [
		{
		// b/331020193, Move to presubmit early april 2024
		"name": "FrameworksServicesTests_contexthub_presubmit"
		},
		{
		"name": "FrameworksServicesTests",
		"options": [
		@@ -26,6 +30,8 @@
		"include-filter": "com.android.server.location.contexthub."
		},
		{
		// I believe this include annotation is preventing tests from being run
		// as there are no matching tests with the Postsubmit annotation.
		"include-annotation": "android.platform.test.annotations.Postsubmit"
		},
		{

services/tests/servicestests/src/com/android/server/om/TEST_MAPPING

+6 −0

Original line number	Diff line number	Diff line
		@@ -16,5 +16,11 @@
		}
		]
		}
		],
		"postsubmit": [
		{
		// b/331020193, Move to presubmit early april 2024
		"name": "FrameworksServicesTests_om"
		}
		]
		}