commit 288a4a2bff0ba8840c6fa0dee3c7c9f1934fa530
author Nicolas Geoffray <ngeoffray@google.com> Tue Oct 07 11:02:40 2014 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue Oct 07 11:04:53 2014 +0100
tree 0c5af8639d3880684d87f685c984207a3b25f953
parent 9800e55b059d4a0fdc0ceebd5652a53f7a8d837a

Merge reference-run-test-classes and run-test-jar.

Change-Id: Ic35e87ffe6ac2d86d8bab89b2dd954ec632df1ea

test/run-test

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 @@
         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 @@
 
 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;