Create separate components for mocking and print
This isolates these tests from the effects of other tests.
Test: m -j cts
Change-Id: I678bb72df6a1d4733cdfd4d1f357a38fd903ddfb
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/CtsConfigLoadingTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/CtsConfigLoadingTest.java
index 8310f8d..0a972f1 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/CtsConfigLoadingTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/CtsConfigLoadingTest.java
@@ -70,8 +70,10 @@
"media",
"metrics",
"misc",
+ "mocking",
"networking",
"neuralnetworks",
+ "print",
"renderscript",
"security",
"statsd",
diff --git a/tests/mocking/AndroidTest.xml b/tests/mocking/AndroidTest.xml
index 58340c5..9e53939 100644
--- a/tests/mocking/AndroidTest.xml
+++ b/tests/mocking/AndroidTest.xml
@@ -16,7 +16,7 @@
-->
<configuration description="Config for Mockito mocking test cases">
<option name="test-suite-tag" value="cts" />
- <option name="config-descriptor:metadata" key="component" value="framework" />
+ <option name="config-descriptor:metadata" key="component" value="mocking" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
diff --git a/tests/mocking/inline/AndroidTest.xml b/tests/mocking/inline/AndroidTest.xml
index d65d6f5..bfade92 100644
--- a/tests/mocking/inline/AndroidTest.xml
+++ b/tests/mocking/inline/AndroidTest.xml
@@ -16,7 +16,7 @@
-->
<configuration description="Config for Mockito inline mocking test cases">
<option name="test-suite-tag" value="cts" />
- <option name="config-descriptor:metadata" key="component" value="framework" />
+ <option name="config-descriptor:metadata" key="component" value="mocking" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
diff --git a/tests/pdf/AndroidTest.xml b/tests/pdf/AndroidTest.xml
index e237461..a402e10 100644
--- a/tests/pdf/AndroidTest.xml
+++ b/tests/pdf/AndroidTest.xml
@@ -16,7 +16,9 @@
<configuration description="Config for CTS Pdf test cases">
<option name="test-suite-tag" value="cts" />
<option name="not-shardable" value="true" />
- <option name="config-descriptor:metadata" key="component" value="framework" />
+
+ <!-- Printing is a large user of PDF, hence run the tests in the same component -->
+ <option name="config-descriptor:metadata" key="component" value="print" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
diff --git a/tests/tests/print/AndroidTest.xml b/tests/tests/print/AndroidTest.xml
index e8eb8cd..5ad9bb7 100644
--- a/tests/tests/print/AndroidTest.xml
+++ b/tests/tests/print/AndroidTest.xml
@@ -16,7 +16,7 @@
<configuration description="Config for CTS Print test cases">
<option name="test-suite-tag" value="cts" />
<option name="not-shardable" value="true" />
- <option name="config-descriptor:metadata" key="component" value="framework" />
+ <option name="config-descriptor:metadata" key="component" value="print" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />