Merge "Add a config to exclude tests in VTS suite"
diff --git a/tools/vts-core-tradefed/res/config/vts-exclude.xml b/tools/vts-core-tradefed/res/config/vts-exclude.xml
new file mode 100644
index 0000000..0c6a173
--- /dev/null
+++ b/tools/vts-core-tradefed/res/config/vts-exclude.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Exclude certain tests in VTS suite with a reason specified">
+
+ <!-- b/154017337: The test is only applicable to vendor device with feature supported. -->
+ <option name="compatibility:exclude-filter" value="VirtualAbRequirementTest.EnabledOnLaunchR"/>
+
+</configuration>
diff --git a/tools/vts-core-tradefed/res/config/vts.xml b/tools/vts-core-tradefed/res/config/vts.xml
index e1f3186..d289a93 100644
--- a/tools/vts-core-tradefed/res/config/vts.xml
+++ b/tools/vts-core-tradefed/res/config/vts.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Runs all tests in VTS suite">
<include name="vts-ccd" />
+ <include name="vts-exclude" />
<option name="plan" value="vts" />
<option name="test-tag" value="vts" />
- <option name="compatibility:exclude-filter" value="VirtualAbRequirementTest.EnabledOnLaunchR"/>
-
</configuration>
