DO NOT MERGE Update Jvmti out of JvmtiPreparer
The special preparer is not needed anymore since b/37579245
Changing back to main stream reporter to avoid filling up
too many sponge label.
Test: build, cts unit tests
Bug: 26548218
Change-Id: Iea3e6a975ea147b293b1250e6a50391e47d574e4
diff --git a/hostsidetests/jvmti/allocation-tracking/AndroidTest.xml b/hostsidetests/jvmti/allocation-tracking/AndroidTest.xml
index 48bf043..706bdef 100644
--- a/hostsidetests/jvmti/allocation-tracking/AndroidTest.xml
+++ b/hostsidetests/jvmti/allocation-tracking/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiTrackingDeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.tracking" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiTrackingHostTestCases.jar" />
diff --git a/hostsidetests/jvmti/redefining/AndroidTest.xml b/hostsidetests/jvmti/redefining/AndroidTest.xml
index 97e4bf2..b1f9b01 100644
--- a/hostsidetests/jvmti/redefining/AndroidTest.xml
+++ b/hostsidetests/jvmti/redefining/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRedefineClassesDeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.redefine" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRedefineClassesHostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml
index d96f8f7..7c08e22 100644
--- a/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest902DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_902" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest902HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml
index 06d69a6..2ab9b3e 100644
--- a/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest903DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_903" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest903HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml
index ad53276..7a8a700 100644
--- a/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest904DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_904" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest904HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml
index b6144a3..87bac7e 100644
--- a/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest905DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_905" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest905HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml
index 6116e8e..37d2fe0 100644
--- a/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest906DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_906" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest906HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml
index 272f0c7..e9948e7 100644
--- a/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest907DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_907" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest907HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml
index 5d5b3f2..3298b96 100644
--- a/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest908DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_908" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest908HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml
index cd8b9dc..6fded28 100644
--- a/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest910DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_910" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest910HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml
index aeb6aa6..6947ae4 100644
--- a/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest911DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_911" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest911HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml
index c23f675..7655d03 100644
--- a/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest913DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_913" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest913HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml
index 6e75f0e..15e58ee 100644
--- a/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest914DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_914" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest914HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml
index 443b3fc..dbe9df0 100644
--- a/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest915DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_915" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest915HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml
index de1bbc0..04a515b 100644
--- a/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest917DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_917" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest917HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml
index 9a99730..e4fc0eb 100644
--- a/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest918DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_918" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest918HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml
index 9c18d06..39f464a 100644
--- a/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest919DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_919" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest919HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml
index ae28aed..5d33072 100644
--- a/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest920DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_920" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest920HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml
index 94414ec..eb1cae9 100644
--- a/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest922DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_922" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest922HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml
index f5d6f38..c1977d6 100644
--- a/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest923DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_923" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest923HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml
index 2315efe..3424b6b 100644
--- a/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest924DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_924" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest924HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml
index f2cbeb4..30c0da8 100644
--- a/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest926DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_926" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest926HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml
index 5601063..52b9b8e 100644
--- a/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest927DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_927" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest927HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml
index d1a476b..477a056 100644
--- a/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest928DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_928" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest928HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml
index 24250ea..cbed864 100644
--- a/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest930DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_930" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest930HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml
index 8cb989a..4532a3e 100644
--- a/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest931DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_931" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest931HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml
index ccd360a..234476c 100644
--- a/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest932DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_932" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest932HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml
index bc0158d..2ef5266 100644
--- a/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest940DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_940" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest940HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml
index c7420fe..a0043a8 100644
--- a/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest942DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_942" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest942HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml
index b45feaf..bf9c3b0 100644
--- a/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest944DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_944" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest944HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml
index e3cf952..be0827b 100644
--- a/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest945DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_945" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest945HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml
index 283cdfd..2a8b3d1 100644
--- a/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest947DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_947" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest947HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml
index d91c141..659506d 100644
--- a/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest951DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_951" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest951HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml
index 20cd0a9..e6351d3 100644
--- a/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest981DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_981" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest981HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml
index b2b68c2..2411871 100644
--- a/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest982DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_982" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest982HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml
index 4204ffe..26c3ed6 100644
--- a/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest984DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_984" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest984HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml
index 57d9e8b..214faba 100644
--- a/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest985DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_985" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest985HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml
index 7a74d32..8b012e0 100644
--- a/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest986DeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.run_test_986" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiRunTest986HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/tagging/AndroidTest.xml b/hostsidetests/jvmti/tagging/AndroidTest.xml
index f7971b8..403ca28 100644
--- a/hostsidetests/jvmti/tagging/AndroidTest.xml
+++ b/hostsidetests/jvmti/tagging/AndroidTest.xml
@@ -15,10 +15,9 @@
-->
<configuration description="Config for CTS JVMTI test cases">
<option name="config-descriptor:metadata" key="component" value="art" />
- <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiTaggingDeviceApp.apk" />
- <option name="package-name" value="android.jvmti.cts.tagging" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJvmtiTaggingHostTestCases.jar" />