summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-08-14 03:05:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-08-14 03:05:42 +0000
commit12f2e66f2edeca9de8b813150b366bbec3a3b3e5 (patch)
tree70331bd4de19cda87bbe90966938c06c896984bc
parent98432a1022fdda04c22853cdec97714e5ec76bf9 (diff)
parentd5f536375e369c8d46e1041101a07a93112b69fe (diff)
Merge "[PM] Add PackageInstaller CUJ test case (21/N)" into main
-rw-r--r--core/java/android/content/pm/TEST_MAPPING11
-rw-r--r--packages/PackageInstaller/TEST_MAPPING13
-rw-r--r--services/core/java/com/android/server/pm/TEST_MAPPING16
3 files changed, 40 insertions, 0 deletions
diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING
index 1fab3cffcebd..570fdfbe9490 100644
--- a/core/java/android/content/pm/TEST_MAPPING
+++ b/core/java/android/content/pm/TEST_MAPPING
@@ -112,6 +112,17 @@
"exclude-annotation":"org.junit.Ignore"
}
]
+ },
+ {
+ "name":"CtsPackageInstallerCUJTestCases",
+ "options":[
+ {
+ "exclude-annotation":"androidx.test.filters.FlakyTest"
+ },
+ {
+ "exclude-annotation":"org.junit.Ignore"
+ }
+ ]
}
],
"presubmit-large":[
diff --git a/packages/PackageInstaller/TEST_MAPPING b/packages/PackageInstaller/TEST_MAPPING
index ff836104f799..be4e87eba5bf 100644
--- a/packages/PackageInstaller/TEST_MAPPING
+++ b/packages/PackageInstaller/TEST_MAPPING
@@ -1,4 +1,17 @@
{
+ "presubmit": [
+ {
+ "name": "CtsPackageInstallerCUJTestCases",
+ "options":[
+ {
+ "exclude-annotation":"androidx.test.filters.FlakyTest"
+ },
+ {
+ "exclude-annotation":"org.junit.Ignore"
+ }
+ ]
+ }
+ ],
"postsubmit": [
{
"name": "CtsPackageInstallTestCases",
diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index c95d88e8c697..8089f21e7a51 100644
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -9,6 +9,22 @@
]
},
{
+ "name": "CtsPackageInstallerCUJTestCases",
+ "file_patterns": [
+ "core/java/.*Install.*",
+ "services/core/.*Install.*",
+ "services/core/java/com/android/server/pm/.*"
+ ],
+ "options":[
+ {
+ "exclude-annotation":"androidx.test.filters.FlakyTest"
+ },
+ {
+ "exclude-annotation":"org.junit.Ignore"
+ }
+ ]
+ },
+ {
"name": "CtsUsesLibraryHostTestCases"
},
{