summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-03-30 01:53:23 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-03-30 01:53:23 +0000
commit197e1d5cc5c9cdcc2e936f4b30cb79cd1df7ad2f (patch)
tree97e1dae108ec40f7e881000b6be018e74eeefc3e
parentc0b767a93717ed9b51cf2beae105785445718fec (diff)
parent421e8f63a364960b7164ddd4f5ecc99779f6839e (diff)
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
-rw-r--r--services/tests/servicestests/AndroidTest.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/tests/servicestests/AndroidTest.xml b/services/tests/servicestests/AndroidTest.xml
index 082827c23b53..0ec16b523a1b 100644
--- a/services/tests/servicestests/AndroidTest.xml
+++ b/services/tests/servicestests/AndroidTest.xml
@@ -14,7 +14,9 @@
limitations under the License.
-->
<configuration description="Runs Frameworks Services Tests.">
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+ <option name="test-suite-tag" value="apct" />
+ <option name="test-suite-tag" value="apct-instrumentation" />
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="FrameworksServicesTests.apk" />
<option name="test-file-name" value="JobTestApp.apk" />
@@ -22,7 +24,6 @@
<option name="test-file-name" value="SuspendTestApp.apk" />
</target_preparer>
- <option name="test-suite-tag" value="apct" />
<option name="test-tag" value="FrameworksServicesTests" />
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.frameworks.servicestests" />