summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-02-19 19:22:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-02-19 19:22:59 +0000
commit210fa5338b330732f682f64384d0e2c34aeba773 (patch)
tree8acc056fe42ff6bbba2a8328fcefa296b39456ea
parentb34d3fc216caa8f89f4b4dd60f7dad0468a57973 (diff)
parent269d98257995b869471f988e184d416c38fa65f4 (diff)
downloadcts-210fa5338b330732f682f64384d0e2c34aeba773.tar.gz
Merge "[RESTRICT AUTOMERGE] Exclude @SecurityTest tests from CTS. These are tested in STS." into oreo-mr1-cts-dev
-rw-r--r--tools/cts-tradefed/res/config/cts-exclude.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/cts-tradefed/res/config/cts-exclude.xml b/tools/cts-tradefed/res/config/cts-exclude.xml
index 240ffa1451f..169ed2e1025 100644
--- a/tools/cts-tradefed/res/config/cts-exclude.xml
+++ b/tools/cts-tradefed/res/config/cts-exclude.xml
@@ -18,4 +18,8 @@
<option name="compatibility:exclude-filter" value="CtsSecurityHostTestCases android.security.cts.SELinuxHostTest#testNoExemptionsForBinderInVendorBan" />
<option name="compatibility:exclude-filter" value="CtsSecurityHostTestCases android.security.cts.SELinuxHostTest#testNoExemptionsForSocketsBetweenCoreAndVendorBan" />
<option name="compatibility:exclude-filter" value="CtsSecurityHostTestCases android.security.cts.SELinuxHostTest#testNoExemptionsForVendorExecutingCore" />
+
+ <!-- Exclude @SecurityTest tests from CTS. These are tested in STS. -->
+ <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:android.platform.test.annotations.SecurityTest" />
+ <option name="compatibility:test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:exclude-annotation:android.platform.test.annotations.SecurityTest" />
</configuration>