Cleanup after test suite split. (d7c440b1) · Commits · e / os / android_frameworks_base

TEST_MAPPING

+30 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,22 @@
		]
		}
		],
		"presubmit-pm": [
		{
		"name": "PackageManagerServiceServerTests",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		}
		],
		"presubmit": [
		{
		"name": "ManagedProvisioningTests",
		@@ -167,6 +183,20 @@
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		},
		{
		"name": "PackageManagerServiceServerTests",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		}
		]
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@ android_test {
		"hamcrest-library",
		"servicestests-utils",
		"service-jobscheduler",
		"service-permission.impl",
		// TODO: remove once Android migrates to JUnit 4.12,
		// which provides assertThrows
		"testng",