commit 83b1c4533e3a79de50685d42a193fb671c24e218
author Makoto Onuki <omakoto@google.com> Thu Aug 02 10:42:53 2018 -0700
committer Makoto Onuki <omakoto@google.com> Thu Aug 02 11:06:49 2018 -0700
tree d19f70841d06cfa1cd77bd578f0847a7463e6acf
parent 7bffd6d68719c9cb2154cf1f3390af81b93d6970

Switch to support test runner which works well with atest

Test: atest ContactsProviderTests ContactsProviderTests2
Bug: 111210683
Bug: 111999945
Change-Id: Ic55f37a85d15babd82307604b2d300506aa2c53f

tests2/AndroidTest.xml

diff --git a/tests2/AndroidTest.xml b/tests2/AndroidTest.xml
index 29fdc83..957350b 100644
--- a/tests2/AndroidTest.xml
+++ b/tests2/AndroidTest.xml
@@ -20,9 +20,8 @@
 
     <option name="test-suite-tag" value="apct" />
     <option name="test-tag" value="ContactsProviderTests2" />
-    <test class="com.android.tradefed.testtype.InstrumentationTest" >
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.providers.contacts.tests2" />
-        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
         <option name="hidden-api-checks" value="false"/>
     </test>
 </configuration>