Move ArtGtestsTarget to general-tests.
The size limiting bug in tradefed has been fixed.
general-tests is more appropriate target since do
not do any device-specific testing.
Tag the ART tests so they can be run from ATP.
Bug: 147817606
Test: atest ArtGtestsTarget --rebuild-module-info -c
Change-Id: Idd5f65608a51a1b145e826c2056032acdfed9b6a
diff --git a/test/Android.bp b/test/Android.bp
index 769f39f..b0813db 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -943,7 +943,7 @@
":com.android.art.testing",
":art-gtest-jars",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
test_config: "gtests-target.xml",
}
diff --git a/test/gtests-target.xml b/test/gtests-target.xml
index 7152835..62aa938 100644
--- a/test/gtests-target.xml
+++ b/test/gtests-target.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="ART gtests">
+ <option name="test-suite-tag" value="art" />
<target_preparer class="com.android.tradefed.targetprep.InstallApexModuleTargetPreparer" >
<option name="test-file-name" value="com.android.art.testing.apex" />
</target_preparer>