summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-03-11 23:48:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-03-11 23:48:37 +0000
commit5855ce58e94b08eff5ac4c70f0beede764a18814 (patch)
treea4059831e6291c36d5f189400e522a9c2505c0ce
parent27deb3b71178f9bfe8743cb50703dc97571e8176 (diff)
parenta3e4e3a7922daf02f4fa8b2e10e3a76861053851 (diff)
Merge "Honor org.junit.Ignore annotation." into rvc-dev
-rw-r--r--packages/SystemUI/TEST_MAPPING6
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING
index cff958faa7e1..c036b041cd95 100644
--- a/packages/SystemUI/TEST_MAPPING
+++ b/packages/SystemUI/TEST_MAPPING
@@ -12,6 +12,9 @@
"include-annotation": "android.platform.test.scenario.annotation.Scenario"
},
{
+ "exclude-annotation": "org.junit.Ignore"
+ },
+ {
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
@@ -28,6 +31,9 @@
"include-annotation": "android.platform.test.scenario.annotation.Scenario"
},
{
+ "exclude-annotation": "org.junit.Ignore"
+ },
+ {
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{