summaryrefslogtreecommitdiffstats
path: root/test/run-test
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2014-10-07 11:02:40 +0100
committerNicolas Geoffray <ngeoffray@google.com>2014-10-07 11:04:53 +0100
commit288a4a2bff0ba8840c6fa0dee3c7c9f1934fa530 (patch)
tree0c5af8639d3880684d87f685c984207a3b25f953 /test/run-test
parent9800e55b059d4a0fdc0ceebd5652a53f7a8d837a (diff)
downloadart-288a4a2bff0ba8840c6fa0dee3c7c9f1934fa530.zip
art-288a4a2bff0ba8840c6fa0dee3c7c9f1934fa530.tar.gz
art-288a4a2bff0ba8840c6fa0dee3c7c9f1934fa530.tar.bz2
Merge reference-run-test-classes and run-test-jar.
Change-Id: Ic35e87ffe6ac2d86d8bab89b2dd954ec632df1ea
Diffstat (limited to 'test/run-test')
-rwxr-xr-xtest/run-test2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/run-test b/test/run-test
index 3b5df0d..d184ea2 100755
--- a/test/run-test
+++ b/test/run-test
@@ -96,6 +96,7 @@ while true; do
runtime="jvm"
prebuild_mode="no"
NEED_DEX="false"
+ run_args="${run_args} --jvm"
shift
elif [ "x$1" = "x-O" ]; then
lib="libart.so"
@@ -260,7 +261,6 @@ function guess_arch_name() {
if [ "$target_mode" = "no" ]; then
if [ "$runtime" = "jvm" ]; then
- RUN="${progdir}/etc/reference-run-test-classes"
if [ "$prebuild_mode" = "yes" ]; then
echo "--prebuild with --jvm is unsupported";
exit 1;