Merge "Add TEST_MAPPING for displayservicetests" into udc-qpr-dev (c5c66d40) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/TEST_MAPPING

+11 −10

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "FrameworksMockingServicesTests",
		"options": [
		{"include-filter": "com.android.server.display"},
		{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"}
		]
		},
		{
		"name": "FrameworksServicesTests",
		"name": "DisplayServiceTests",
		"options": [
		{"include-filter": "com.android.server.display"},
		{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
		@@ -31,5 +23,14 @@
		}
		]
		}
		],
		"postsubmit": [
		{
		"name": "DisplayServiceTests",
		"options": [
		{"include-filter": "com.android.server.display"},
		{"exclude-annotation": "org.junit.Ignore"}
		]
		}
		]
		}

+2 −8

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		"imports": [
		{
		"name": "DisplayServiceTests",
		"options": [
		{"include-filter": "com.android.server.display"},
		{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"},
		{"exclude-annotation": "org.junit.Ignore"}
		]
		"path": "frameworks/base/services/core/java/com/android/server/display"
		}
		]
		}