summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Shi <dshi@google.com> 2019-05-01 10:36:20 -0700
committer Dan Shi <dshi@google.com> 2019-05-03 15:42:41 -0700
commit1cf185054f1d213e94d188ea3b54d2cf9abe41a3 (patch)
treeb46ad9f60bec2783580540360a20ff02cfebe9b4
parentc47b4a8d2a7c93fb8009d296b398869aded64989 (diff)
Add exclude-annotation LargeTest to CtsAppTestCases
This is needed so merging with cts/tests/app/TEST_MAPPING can be properly handled to exclude LargeTest. Once b/117880789 is fixed, we won't need this any more. Bug: 117880789, 130828971 Test: none Exempt-From-Owner-Approval: only change test mapping file to fix broken test suite. Change-Id: I0369f47e6de6aeca06a9f1e03c6ec00f7c2ee767
-rw-r--r--services/core/java/com/android/server/am/TEST_MAPPING3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/TEST_MAPPING b/services/core/java/com/android/server/am/TEST_MAPPING
index d56cb7914b9a..21d4925722d0 100644
--- a/services/core/java/com/android/server/am/TEST_MAPPING
+++ b/services/core/java/com/android/server/am/TEST_MAPPING
@@ -10,6 +10,9 @@
"include-annotation": "android.platform.test.annotations.Presubmit"
},
{
+ "exclude-annotation": "androidx.test.filters.LargeTest"
+ },
+ {
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]