Change CtsJdwpTestCases to run with new agent JDWP implementation.
This CTS test was still testing the old JDWP implementation. We should
be testing the new one. This test will look at the
dalvik.vm.jdwp-provider property and run the jdwp tests using
whichever jdwp implementation is being used. If the property is unset,
'default' or 'adbconnection' it will use the JVMTI agent jdwp
implementation. If it is 'internal' it will use the old internal ART
jdwp implementation.
Bug: 74028528
Bug: 62821960
Test: cts-tradefed run cts -m CtsJdwpTestCases
Test: adb setprop dalvik.vm.jdwp-provider internal &&
cts-tradefed run cts -m CtsJdwpTestCases
Change-Id: I21aa701f30ff914be0350ff6db1692a849c88569
diff --git a/tests/jdwp/AndroidTest.xml b/tests/jdwp/AndroidTest.xml
index 72d26b1..19d1e76 100644
--- a/tests/jdwp/AndroidTest.xml
+++ b/tests/jdwp/AndroidTest.xml
@@ -35,8 +35,12 @@
<option name="dalvik-arg" value="-Djpda.settings.verbose=false" />
<option name="dalvik-arg" value="-Djpda.settings.timeout=10000" />
<option name="dalvik-arg" value="-Djpda.settings.waitingTime=10000" />
- <option name="dalvik-arg" value="-Djpda.settings.debuggeeJavaPath='dalvikvm|#ABI#| -XXlib:libart.so -Xcompiler-option --debuggable -Xusejit:true'" />
+ <option name="dalvik-arg-adbconnection" value="-Djpda.settings.debuggeeAgentArgument=-agentpath:" />
+ <option name="dalvik-arg-adbconnection" value="-Djpda.settings.debuggeeAgentName=libjdwp.so" />
+ <option name="dalvik-arg-adbconnection" value="-Djpda.settings.debuggeeJavaPath='dalvikvm|#ABI#| -XXlib:libart.so -Xplugin:libopenjdkjvmti.so -Xcompiler-option --debuggable -Xusejit:true'" />
+ <option name="dalvik-arg-internal" value="-Djpda.settings.debuggeeJavaPath='dalvikvm|#ABI#| -XjdwpProvider:internal -XXlib:libart.so -Xcompiler-option --debuggable -Xusejit:true'" />
<option name="known-failures" value="/expectations/jdwp-known-failures.txt" />
+ <option name="known-failures-adbconnection" value="/expectations/external_oj_libjdwp_art_failures.txt" />
<option name="runtime-hint" value="16m" />
<!-- Temporary work around to avoid running android.test.AndroidTestCase. -->