diff options
| author | Dan Shi <dshi@google.com> | 2020-12-05 02:19:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 02:19:53 +0000 |
| commit | e555468ed80052a4e0605a2d63680e97bd4d69d4 (patch) | |
| tree | 274169578a23107423fda587263eea9672f2ac96 | |
| parent | 0aba5b1061d8b5c202ff6fa19efb05143d0ecfeb (diff) | |
| parent | 9586d4d46c44be38a5cac66d65a4678627617b39 (diff) | |
Merge "Move CtsTelecomTestCases to group presubmit-large" am: 471929b98f am: 9586d4d46c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1516543
Change-Id: I9acb97948b599479ee2055508a7aa94c3ffb53a5
| -rw-r--r-- | core/tests/overlaytests/remount/TEST_MAPPING | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/om/TEST_MAPPING | 8 | ||||
| -rw-r--r-- | telecomm/TEST_MAPPING | 4 | ||||
| -rw-r--r-- | tests/RollbackTest/TEST_MAPPING | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/core/tests/overlaytests/remount/TEST_MAPPING b/core/tests/overlaytests/remount/TEST_MAPPING index 54dd4310bd6e..22b28b5344bb 100644 --- a/core/tests/overlaytests/remount/TEST_MAPPING +++ b/core/tests/overlaytests/remount/TEST_MAPPING @@ -1,7 +1,7 @@ { - "presubmit": [ + "presubmit-large": [ { "name" : "OverlayRemountedTest" } ] -}
\ No newline at end of file +} diff --git a/services/core/java/com/android/server/om/TEST_MAPPING b/services/core/java/com/android/server/om/TEST_MAPPING index 6edd76f1810a..e8a2a02e6a8c 100644 --- a/services/core/java/com/android/server/om/TEST_MAPPING +++ b/services/core/java/com/android/server/om/TEST_MAPPING @@ -15,9 +15,6 @@ "name": "OverlayHostTests" }, { - "name": "OverlayRemountedTest" - }, - { "name": "CtsAppSecurityHostTestCases", "options": [ { @@ -25,5 +22,10 @@ } ] } + ], + "presubmit-large": [ + { + "name": "OverlayRemountedTest" + } ] } diff --git a/telecomm/TEST_MAPPING b/telecomm/TEST_MAPPING index c9903f9fa901..1963ff3cabc7 100644 --- a/telecomm/TEST_MAPPING +++ b/telecomm/TEST_MAPPING @@ -23,7 +23,9 @@ "exclude-annotation": "androidx.test.filters.FlakyTest" } ] - }, + } + ], + "presubmit-large": [ { "name": "CtsTelecomTestCases", "options": [ diff --git a/tests/RollbackTest/TEST_MAPPING b/tests/RollbackTest/TEST_MAPPING index 0f4c4603f9b4..7f9f2dcf2bde 100644 --- a/tests/RollbackTest/TEST_MAPPING +++ b/tests/RollbackTest/TEST_MAPPING @@ -1,5 +1,5 @@ { - "presubmit": [ + "presubmit-large": [ { "name": "RollbackTest" }, |