Add --invoke-with and -d to the dalvik tests.
Change-Id: I358945fd2b41c1615441c1687a582a66e662eba9
diff --git a/test/etc/host-run-test-jar b/test/etc/host-run-test-jar
index ea20da5..1fba19d 100755
--- a/test/etc/host-run-test-jar
+++ b/test/etc/host-run-test-jar
@@ -6,7 +6,6 @@
# Options:
# --quiet -- don't chatter
# --debug -- wait for debugger to attach
-# --valgrind -- use valgrind
# --no-verify -- turn off verification (on by default)
# --no-optimize -- turn off optimization (on by default)
@@ -20,7 +19,7 @@
GDB="n"
VERIFY="y"
OPTIMIZE="y"
-VALGRIND="n"
+INVOKE_WITH=""
DEV_MODE="n"
QUIET="n"
@@ -34,8 +33,9 @@
elif [ "x$1" = "x--gdb" ]; then
GDB="y"
shift
- elif [ "x$1" = "x--valgrind" ]; then
- VALGRIND="y"
+ elif [ "x$1" = "x--invoke-with" ]; then
+ shift
+ INVOKE_WITH="$1"
shift
elif [ "x$1" = "x--dev" ]; then
DEV_MODE="y"
@@ -50,7 +50,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
@@ -77,14 +77,6 @@
msg "Skipping verification"
fi
-if [ "$VALGRIND" = "y" ]; then
- msg "Running with valgrind"
- valgrind_cmd="valgrind"
- #valgrind_cmd="valgrind --leak-check=full"
-else
- valgrind_cmd=""
-fi
-
msg "------------------------------"
HOSTBASE="${ANDROID_BUILD_TOP}/out/host"
@@ -123,6 +115,6 @@
gdbargs="--args $exe"
fi
-$valgrind_cmd $gdb $exe $gdbargs "-Xbootclasspath:${bpath}" \
+$INVOKE_WITH $gdb $exe $gdbargs "-Xbootclasspath:${bpath}" \
$DEX_VERIFY $DEX_OPTIMIZE $DEX_DEBUG -ea \
-cp test.jar Main "$@"
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"
diff --git a/test/etc/reference-run-test-classes b/test/etc/reference-run-test-classes
index 94c8050..b16d9ff 100755
--- a/test/etc/reference-run-test-classes
+++ b/test/etc/reference-run-test-classes
@@ -36,7 +36,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
diff --git a/test/run-all-tests b/test/run-all-tests
index ce28457..bd5eea3 100755
--- a/test/run-all-tests
+++ b/test/run-all-tests
@@ -68,7 +68,7 @@
usage="yes"
shift
elif expr "x$1" : "x--" >/dev/null 2>&1; then
- echo "unknown option: $1" 1>&2
+ echo "unknown $0 option: $1" 1>&2
usage="yes"
break
else
diff --git a/test/run-test b/test/run-test
index b80fbd9..08da171 100755
--- a/test/run-test
+++ b/test/run-test
@@ -57,6 +57,9 @@
elif [ "x$1" = "x--reference" ]; then
RUN="${progdir}/etc/reference-run-test-classes"
shift
+ elif [ "x$1" = "x-d" ]; then
+ run_args="${run_args} -d"
+ shift
elif [ "x$1" = "x--debug" ]; then
run_args="${run_args} --debug"
shift
@@ -76,8 +79,10 @@
elif [ "x$1" = "x--no-precise" ]; then
run_args="${run_args} --no-precise"
shift
- elif [ "x$1" = "x--valgrind" ]; then
- run_args="${run_args} --valgrind"
+ elif [ "x$1" = "x--invoke-with" ]; then
+ shift
+ what="$1"
+ run_args="${run_args} --invoke-with \"${what}\""
shift
elif [ "x$1" = "x--dev" ]; then
run_args="${run_args} --dev"
@@ -90,7 +95,7 @@
usage="yes"
shift
elif expr "x$1" : "x--" >/dev/null 2>&1; then
- echo "unknown option: $1" 1>&2
+ echo "unknown $0 option: $1" 1>&2
usage="yes"
break
else