Create new config to exclude instant applicable only tests

cts-instant.xml references cts-exclude.xml which
also exclude instant applicable only tests. This
CL pull those filters out of cts-exclude.xml into
a separate config which gets included only in
cts.xml for full mode.

bug: 70949298

Test: cts-instant-tradefed run cts-instant -m CtsMediaHostTestCases
      cts-tradefed run cts-dev -m CtsAppWidgetTestCases
          -t android.appwidget.cts.AppWidgetTest#testInstantAppsCannotProvideAppWidgets

Change-Id: I219da56c28e79f842a54ee7a1bd7060d0c4d3d3f

4 files changed, 23 insertions, 7 deletions

diff --git a/tools/cts-tradefed/res/config/cts-exclude-instant.xml b/tools/cts-tradefed/res/config/cts-exclude-instant.xml
new file mode 100644
index 00000000..402d2277
--- /dev/null
+++ b/tools/cts-tradefed/res/config/cts-exclude-instant.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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="Excluded tests applicable only to instant mode">
+    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:android.platform.test.annotations.AppModeInstant" />
+    <option name="compatibility:test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:exclude-annotation:android.platform.test.annotations.AppModeInstant" />
+    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.HostTest:exclude-annotation:android.platform.test.annotations.AppModeInstant" />
+</configuration>
diff --git a/tools/cts-tradefed/res/config/cts-exclude.xml b/tools/cts-tradefed/res/config/cts-exclude.xml
index 5cdb1704..240ffa14 100644
--- a/tools/cts-tradefed/res/config/cts-exclude.xml
+++ b/tools/cts-tradefed/res/config/cts-exclude.xml
@@ -18,10 +18,4 @@
     <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 tests applicable only to instant mode -->
-    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:android.platform.test.annotations.AppModeInstant" />
-    <option name="compatibility:test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:exclude-annotation:android.platform.test.annotations.AppModeInstant" />
-    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.HostTest:exclude-annotation:android.platform.test.annotations.AppModeInstant" />
-
 </configuration>
diff --git a/tools/cts-tradefed/res/config/cts-instant.xml b/tools/cts-tradefed/res/config/cts-instant.xml
index df57cfec..ce502f6d 100644
--- a/tools/cts-tradefed/res/config/cts-instant.xml
+++ b/tools/cts-tradefed/res/config/cts-instant.xml
@@ -15,7 +15,8 @@
 -->
 <configuration description="Runs CTS-instant from a pre-existing CTS installation">
 
-    <include name="cts" />
+    <include name="cts-common" />
+    <include name="cts-exclude" />
 
     <!-- This plan is only for instant app specific tests. -->
     <option name="plan" value="cts-instant" />
diff --git a/tools/cts-tradefed/res/config/cts.xml b/tools/cts-tradefed/res/config/cts.xml
index 9022a41d..bc5c4473 100644
--- a/tools/cts-tradefed/res/config/cts.xml
+++ b/tools/cts-tradefed/res/config/cts.xml
@@ -17,6 +17,7 @@
 
     <include name="cts-common" />
     <include name="cts-exclude" />
+    <include name="cts-exclude-instant" />
 
     <option name="plan" value="cts" />