Merge "Migrate TestMapping options to Android.bp Presubmit" into main (f9c1047e) · Commits · e / os / android_frameworks_base

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

+0 −17

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "FrameworksServicesTests",
		"options": [
		{
		"include-filter": "com.android.server.contentcapture"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		}
		],
		"postsubmit": [
		{
		// b/331020193, Move to presubmit early april 2024
		"name": "FrameworksServicesTests_contentcapture"
		}
		]

+0 −17

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "FrameworksServicesTests",
		"options": [
		{
		"include-filter": "com.android.server.contentprotection"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		}
		],
		"postsubmit": [
		{
		// b/331020193, Move to presubmit early april 2024
		"name": "FrameworksServicesTests_contentprotection"
		}
		]

+1 −19

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "FrameworksServicesTests",
		"options": [
		{
		"include-filter": "com.android.server.location.contexthub."
		},
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		"name": "FrameworksServicesTests_contexthub_presubmit"
		}
		],
		"postsubmit": [
		{
		// b/331020193, Move to presubmit early april 2024
		"name": "FrameworksServicesTests_contexthub_presubmit"
		},
		{
		"name": "FrameworksServicesTests",
		"options": [

+1 −12

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "FrameworksServicesTests",
		"options": [
		{
		"include-filter": "com.android.server.om."
		}
		]
		"name": "FrameworksServicesTests_om"
		},
		{
		"name": "PackageManagerServiceHostTests",
		@@ -16,11 +11,5 @@
		}
		]
		}
		],
		"postsubmit": [
		{
		// b/331020193, Move to presubmit early april 2024
		"name": "FrameworksServicesTests_om"
		}
		]
		}

+0 −11

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "FrameworksServicesTests",
		"options": [
		{
		"include-filter": "com.android.server.os."
		}
		]
		}
		],
		"postsubmit": [
		{
		// b/331020193, Move to presubmit early april 2024
		"name": "FrameworksServicesTests_os"
		}
		]