commit 58bcc40e42d0438d3a71149ac53420d50a71fd8c
author Elliott Hughes <enh@google.com> Tue Feb 14 14:10:10 2012 -0800
committer Elliott Hughes <enh@google.com> Tue Feb 14 14:10:10 2012 -0800
tree 23e7904af3a7d40e11b52b59d15e2f33c6eb22f9
parent b305770f45e9cec66c3bdf792c4e7fa9cff5ec6e

We replace -d with -O recently, but not uniformly.

Change-Id: Ia66037addabe8f0c61531d955bf570aa4c7c83e6

test/etc/push-and-run-test-jar

diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar
index e606ef3..19d5988 100755
--- a/test/etc/push-and-run-test-jar
+++ b/test/etc/push-and-run-test-jar
@@ -23,7 +23,7 @@
 DEBUG="n"
 VERIFY="y"
 OPTIMIZE="y"
-ZYGOTE="n"
+ZYGOTE=""
 QUIET="n"
 DEV_MODE="n"
 INVOKE_WITH=""
@@ -39,7 +39,7 @@
         DEBUG="y"
         shift
     elif [ "x$1" = "x--zygote" ]; then
-        ZYGOTE="y"
+        ZYGOTE="--zygote"
         msg "Spawning from zygote"
         shift
     elif [ "x$1" = "x--dev" ]; then
@@ -66,7 +66,7 @@
     fi
 done
 
-if [ "$ZYGOTE" = "n" ]; then
+if [ "$ZYGOTE" = "" ]; then
     if [ "$OPTIMIZE" = "y" ]; then
         if [ "$VERIFY" = "y" ]; then
             DEX_OPTIMIZE="-Xdexopt:verified"
@@ -116,18 +116,12 @@
   #   jdb -attach localhost:12345
 fi
 
-if [ "$ZYGOTE" = "y" ]; then
-  adb shell cd /data \; dvz -classpath $TEST_NAME.jar Main "$@"
-else
-  cmdline="cd /data; $INVOKE_WITH $OATEXEC ${DEX_DEBUG} -Xjnigreflimit:256 \
-      -Ximage:/data/art-test/core.art \
-      -cp /data/art-test/$TEST_NAME.jar \
-      Main"
-  #cmdline="cd /data; dalvikvm $DEX_VERIFY $DEX_OPTIMIZE $DEX_DEBUG \
-  #     -cp test.jar -Xint:${INTERP} -ea Main"
-  if [ "$DEV_MODE" = "y" ]; then
-    echo $cmdline "$@"
-  fi
-
-  adb shell $cmdline "$@"
+cmdline="cd /data; $INVOKE_WITH $OATEXEC $DEX_DEBUG $ZYGOTE -Xjnigreflimit:256 \
+    -Ximage:/data/art-test/core.art \
+    -cp /data/art-test/$TEST_NAME.jar \
+    Main"
+if [ "$DEV_MODE" = "y" ]; then
+  echo $cmdline "$@"
 fi
+
+adb shell $cmdline "$@"