Merge "ART: Fix run-test invocation for jvm tests"

2 files changed, 8 insertions, 2 deletions

diff --git a/test/run-test b/test/run-test
index 8e012d13fb..5bd8b3b348 100755
--- a/test/run-test
+++ b/test/run-test
@@ -441,6 +441,11 @@ while true; do
     fi
 done
 
+if [ "$usage" = "no" -a "x$1" = "x" ]; then
+  echo "missing test to run" 1>&2
+  usage="yes"
+fi
+
 # The DEX_LOCATION with the chroot prefix, if any.
 chroot_dex_location="$chroot$DEX_LOCATION"
 
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py
index 09b9b210fc..be7e225e05 100755
--- a/test/testrunner/testrunner.py
+++ b/test/testrunner/testrunner.py
@@ -411,8 +411,9 @@ def run_tests(tests):
       elif prebuild == 'no-dex2oat':
         options_test += ' --no-prebuild --no-dex2oat'
 
-      # Add option and remove the cdex- prefix.
-      options_test += ' --compact-dex-level ' + cdex_level.replace('cdex-','')
+      if cdex_level:
+        # Add option and remove the cdex- prefix.
+        options_test += ' --compact-dex-level ' + cdex_level.replace('cdex-','')
 
       if compiler == 'optimizing':
         options_test += ' --optimizing'