summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Song Chun Fan <schfan@google.com> 2023-08-11 20:05:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-11 20:05:10 +0000
commit043d934f91085f7cbd239ca86d565d77ef3ccafa (patch)
tree32013ccdbbe6ed22431fd14d86871df055992c9a
parent53692d2119f67da0769fb009015a209cb58f5fab (diff)
parente8d244301ca5e2b2282d59a96a0791249d994cd2 (diff)
[RESTRICT AUTOMERGE][pm] Move CtsContentTestCases to postsubmit for pm changes am: e8d244301c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24357433 Change-Id: I70706437ea8a6a4fa63ca5340d433f0e5cd78f7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/content/pm/TEST_MAPPING28
-rw-r--r--services/core/java/com/android/server/pm/TEST_MAPPING6
2 files changed, 16 insertions, 18 deletions
diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING
index 1c1f58a19abc..187a21e45331 100644
--- a/core/java/android/content/pm/TEST_MAPPING
+++ b/core/java/android/content/pm/TEST_MAPPING
@@ -53,20 +53,6 @@
],
"presubmit-large": [
{
- "name": "CtsContentTestCases",
- "options": [
- {
- "exclude-annotation": "androidx.test.filters.FlakyTest"
- },
- {
- "exclude-annotation": "org.junit.Ignore"
- },
- {
- "include-filter": "android.content.pm.cts"
- }
- ]
- },
- {
"name": "CtsUsesNativeLibraryTest",
"options": [
{
@@ -152,6 +138,20 @@
],
"postsubmit": [
{
+ "name": "CtsContentTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ },
+ {
+ "exclude-annotation": "org.junit.Ignore"
+ },
+ {
+ "include-filter": "android.content.pm.cts"
+ }
+ ]
+ },
+ {
"name": "CtsAppSecurityHostTestCases",
"options": [
{
diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index 9c74dd795d30..9d76072cceeb 100644
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -81,7 +81,7 @@
]
}
],
- "presubmit-large": [
+ "postsubmit": [
{
"name": "CtsContentTestCases",
"options": [
@@ -95,9 +95,7 @@
"include-filter": "android.content.pm.cts"
}
]
- }
- ],
- "postsubmit": [
+ },
{
"name": "CtsPermissionTestCases",
"options": [