summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-04 21:39:35 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-08-04 21:39:35 +0000
commitf17963b1b87e59cf974a9e2da0ec8bcdc8ad2066 (patch)
tree681d5ef75775aa35dc8e91d6d148d13b7a2d6cb5
parent5d2eebc09f78dbc610a93a79f62e302b7be3e37d (diff)
parentc00c8943d90e5d51e1e50f9645564d1c2d88f358 (diff)
Merge "Temporarely move CtsPackageManagerTestCases to presubmit-large." into main
-rw-r--r--core/java/android/content/pm/TEST_MAPPING10
-rw-r--r--core/java/android/util/apk/TEST_MAPPING4
-rw-r--r--services/core/java/com/android/server/pm/TEST_MAPPING4
-rw-r--r--services/incremental/TEST_MAPPING4
4 files changed, 14 insertions, 8 deletions
diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING
index 6419f8c6f0d9..7e30157865f0 100644
--- a/core/java/android/content/pm/TEST_MAPPING
+++ b/core/java/android/content/pm/TEST_MAPPING
@@ -114,7 +114,9 @@
"exclude-annotation":"org.junit.Ignore"
}
]
- },
+ }
+ ],
+ "presubmit-large":[
{
"name":"CtsPackageManagerTestCases",
"options":[
@@ -125,9 +127,7 @@
"exclude-annotation":"org.junit.Ignore"
}
]
- }
- ],
- "presubmit-large":[
+ },
{
"name":"CtsUsesNativeLibraryTest",
"options":[
@@ -164,4 +164,4 @@
"name":"CtsInstallHostTestCases"
}
]
-} \ No newline at end of file
+}
diff --git a/core/java/android/util/apk/TEST_MAPPING b/core/java/android/util/apk/TEST_MAPPING
index a3a86fdb4b82..7668eec474ab 100644
--- a/core/java/android/util/apk/TEST_MAPPING
+++ b/core/java/android/util/apk/TEST_MAPPING
@@ -7,7 +7,9 @@
"include-filter": "android.util.apk.SourceStampVerifierTest"
}
]
- },
+ }
+ ],
+ "presubmit-large": [
{
"name": "CtsPackageManagerTestCases",
"options": [
diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index e2bbaffe5058..4ba174d28482 100644
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -102,7 +102,9 @@
"include-filter": "android.appsecurity.cts.EphemeralTest#testGetSearchableInfo"
}
]
- },
+ }
+ ],
+ "presubmit-large":[
{
"name": "CtsPackageManagerTestCases",
"options": [
diff --git a/services/incremental/TEST_MAPPING b/services/incremental/TEST_MAPPING
index cdb1fc6f4079..4af880ded953 100644
--- a/services/incremental/TEST_MAPPING
+++ b/services/incremental/TEST_MAPPING
@@ -27,7 +27,9 @@
},
{
"name": "CtsInstalledLoadingProgressHostTests"
- },
+ }
+ ],
+ "presubmit-large": [
{
"name": "CtsPackageManagerTestCases",
"options": [