diff options
| author | 2023-08-11 20:52:56 +0000 | |
|---|---|---|
| committer | 2023-08-11 20:52:56 +0000 | |
| commit | fe96da10b3838c9f7370ac99eda02f9e7f9c62c3 (patch) | |
| tree | 312fa0adcbb6b52d9d4752dab0869d5ad2b9050e | |
| parent | bef1d1a17669aa9710ded049d4fbbb2f89c111ec (diff) | |
| parent | 98857405c8ea2b639bc3561f58aef6c7cec82dda (diff) | |
Merge "[pm] Move CtsContentTestCases to postsubmit for pm changes" into udc-dev am: bc36620989 am: 98857405c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24356854
Change-Id: I6c6c64e88e94fff086fe90b73b30fcef554f8d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/content/pm/TEST_MAPPING | 28 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/TEST_MAPPING | 6 |
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 3ffbe1d1c71b..2ea6513c4d77 100644 --- a/core/java/android/content/pm/TEST_MAPPING +++ b/core/java/android/content/pm/TEST_MAPPING @@ -101,20 +101,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":[ { @@ -156,6 +142,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 a622d0743bbb..bb6e11dcf8d4 100644 --- a/services/core/java/com/android/server/pm/TEST_MAPPING +++ b/services/core/java/com/android/server/pm/TEST_MAPPING @@ -90,7 +90,7 @@ ] } ], - "presubmit-large": [ + "postsubmit": [ { "name": "CtsContentTestCases", "options": [ @@ -104,9 +104,7 @@ "include-filter": "android.content.pm.cts" } ] - } - ], - "postsubmit": [ + }, { "name": "CtsPermissionTestCases", "options": [ |