summaryrefslogtreecommitdiff
path: root/test/etc/run-test-jar
diff options
context:
space:
mode:
Diffstat (limited to 'test/etc/run-test-jar')
-rwxr-xr-xtest/etc/run-test-jar8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 5e40b86aa0..ca24471675 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -436,7 +436,13 @@ if [ "$DEBUGGER" = "y" ]; then
msg " adb forward tcp:$PORT tcp:$PORT"
fi
msg " jdb -attach localhost:$PORT"
- DEBUGGER_OPTS="-agentlib:jdwp=transport=dt_socket,address=$PORT,server=y,suspend=y"
+ if [ "$USE_JVM" = "n" ]; then
+ # TODO We should switch over to using the jvmti agent by default.
+ # Need to tell the runtime to enable the internal jdwp implementation.
+ DEBUGGER_OPTS="-XjdwpOptions:transport=dt_socket,address=$PORT,server=y,suspend=y -XjdwpProvider:internal"
+ else
+ DEBUGGER_OPTS="-agentlib:jdwp=transport=dt_socket,address=$PORT,server=y,suspend=y"
+ fi
elif [ "$DEBUGGER" = "agent" ]; then
PORT=12345
# TODO Support ddms connection and support target.