commit cf8d741f3d677c32aeb600fb855287dcea08926e
author Brett Chabot <brettchabot@google.com> Thu Jan 09 14:32:20 2014 -0800
committer Brett Chabot <brettchabot@google.com> Tue Mar 11 17:54:45 2014 -0700
tree 73110eb3e7d9cd7bb6283db94ac4937b68443242
parent dcc684355675815a4c9c1cf3bc39cea41c7535ea

Move to android.support.test as CTS instrumentation runner.

Also do the following related cleanup
- Remove references to deprecated BrokenTest and KnownFailure
- Switch CTS tests to build against SDK and not private
android.test.runner where possible

Bug: 12924356

Change-Id: If6151b836456eec4838f8d7d6e11c9834c007fca

tests/cts/net/AndroidManifest.xml

diff --git a/tests/cts/net/AndroidManifest.xml b/tests/cts/net/AndroidManifest.xml
index ade6728..652262d 100644
--- a/tests/cts/net/AndroidManifest.xml
+++ b/tests/cts/net/AndroidManifest.xml
@@ -32,9 +32,12 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
-    <instrumentation android:name="android.test.InstrumentationCtsTestRunner"
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
                      android:targetPackage="com.android.cts.net"
-                     android:label="CTS tests of android.net"/>
+                     android:label="CTS tests of android.net">
+        <meta-data android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
 
 </manifest>