summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-08-29 21:43:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-29 21:43:14 +0000
commit5860c207c9b2e9e60df2691c8a8b2b34c8a4ac0f (patch)
tree94d58bfd3d0f934e99e8d33dff817b33921b1c62
parentb67add484c7a5a7207b563c33f5131bfe8cc20a2 (diff)
parent9dc9fd8930b7c86175e1bc11068e92d1c1f57501 (diff)
Merge "Exclude large tests from presubmit." am: 3d8681e31d am: 9dc9fd8930
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2176682 Change-Id: Ia285f9d7b8e2ac0a4b7116af9b759bed56074aa7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/app/TEST_MAPPING3
-rw-r--r--core/java/android/content/TEST_MAPPING3
-rw-r--r--core/java/android/view/TEST_MAPPING3
3 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 32207af22dc1..a2e42398b437 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -121,6 +121,9 @@
"include-annotation": "android.platform.test.annotations.Presubmit"
},
{
+ "exclude-annotation": "android.platform.test.annotations.LargeTest"
+ },
+ {
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
diff --git a/core/java/android/content/TEST_MAPPING b/core/java/android/content/TEST_MAPPING
index 5bb845d5a1a1..dac79e7124bd 100644
--- a/core/java/android/content/TEST_MAPPING
+++ b/core/java/android/content/TEST_MAPPING
@@ -7,6 +7,9 @@
"include-annotation": "android.platform.test.annotations.Presubmit"
},
{
+ "exclude-annotation": "android.platform.test.annotations.LargeTest"
+ },
+ {
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
diff --git a/core/java/android/view/TEST_MAPPING b/core/java/android/view/TEST_MAPPING
index 50d69f78688a..ecb98f9ce801 100644
--- a/core/java/android/view/TEST_MAPPING
+++ b/core/java/android/view/TEST_MAPPING
@@ -10,6 +10,9 @@
"include-annotation": "android.platform.test.annotations.Presubmit"
},
{
+ "exclude-annotation": "android.platform.test.annotations.LargeTest"
+ },
+ {
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{