commit 7c04610d42cad31e6593ae1561ed855aceac1d7a
author Elliott Hughes <enh@google.com> Wed Oct 19 18:16:03 2011 -0700
committer Elliott Hughes <enh@google.com> Wed Oct 19 18:16:03 2011 -0700
tree 42c030ff5fc14983eca8dc85c87b5eb287c7634e
parent c393a4f7c91534ac41a81d66b12c22e68df28fc7

Add --invoke-with and -d to the dalvik tests.

Change-Id: I358945fd2b41c1615441c1687a582a66e662eba9

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 bcc0ceb..858ba74 100755
--- a/test/etc/push-and-run-test-jar
+++ b/test/etc/push-and-run-test-jar
@@ -18,17 +18,22 @@
     fi
 }
 
+OATEXEC="oatexec"
 DEBUG="n"
 VERIFY="y"
 OPTIMIZE="y"
 ZYGOTE="n"
 QUIET="n"
 DEV_MODE="n"
+INVOKE_WITH=""
 
 while true; do
     if [ "x$1" = "x--quiet" ]; then
         QUIET="y"
         shift
+    elif [ "x$1" = "x-d" ]; then
+        OATEXEC="oatexecd"
+        shift
     elif [ "x$1" = "x--debug" ]; then
         DEBUG="y"
         shift
@@ -39,6 +44,10 @@
     elif [ "x$1" = "x--dev" ]; then
         DEV_MODE="y"
         shift
+    elif [ "x$1" = "x--invoke-with" ]; then
+        shift
+        INVOKE_WITH="$1"
+        shift
     elif [ "x$1" = "x--no-verify" ]; then
         VERIFY="n"
         shift
@@ -49,7 +58,7 @@
         shift
         break
     elif expr "x$1" : "x--" >/dev/null 2>&1; then
-        echo "unknown option: $1" 1>&2
+        echo "unknown $0 option: $1" 1>&2
         exit 1
     else
         break
@@ -99,7 +108,7 @@
 if [ "$ZYGOTE" = "y" ]; then
   adb shell cd /data \; dvz -classpath $TEST_NAME.jar Main "$@"
 else
-  cmdline="cd /data; oatexecd -Xjnigreflimit:256 \
+  cmdline="cd /data; $INVOKE_WITH $OATEXEC -Xjnigreflimit:256 \
       -Ximage:/data/art-test/core.art \
       -cp /data/art-test/$TEST_NAME.jar \
       Main"