commit f1f05d303988a5c071c87b760056be8358276c94
author Nicolas Geoffray <ngeoffray@google.com> Wed Oct 08 20:13:53 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 08 20:13:54 2014 +0000
tree 225a2d51ceb9a125316ab61552045a728d9063f9
parent 175b2732f7e55a07094c30aa08d946189b4af97e
parent baf9102b110702b18826f5aec67429af4283def8

Merge "Really fix --gdb when running tests on target."

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 59d241a..9a32ec7 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -16,10 +16,11 @@
 DEBUGGER="n"
 DEV_MODE="n"
 DEX2OAT=""
-GDB_SERVER="gdbserver"
 FALSE_BIN="/system/bin/false"
 FLAGS=""
 GDB=""
+GDB_ARGS=""
+GDB_SERVER="gdbserver"
 HAVE_IMAGE="y"
 HOST="n"
 INTERPRETER="n"
@@ -190,7 +191,6 @@
 if [ "$USE_GDB" = "y" ]; then
   if [ "$HOST" = "n" ]; then
     GDB="$GDB_SERVER :5039"
-    GDB_ARGS="$DALVIKVM"
   else
     if [ `uname` = "Darwin" ]; then
         GDB=lldb