Don't bother running dx when we're testing on the RI.

Also drop the -ea argument to the RI; we don't support assert, so it's
misleading if tests behave differently on the RI.

Change-Id: I4db66ee13fe6b778385778a783ded460b5fcf5f7

3 files changed, 12 insertions, 6 deletions

diff --git a/test/etc/default-build b/test/etc/default-build
index aefb626883..57a2a04278 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -21,15 +21,18 @@ mkdir classes
 ${JAVAC} -d classes `find src -name '*.java'`
 
 if [ -r src2 ]; then
-    ${JAVAC} -d classes `find src2 -name '*.java'`
+  ${JAVAC} -d classes `find src2 -name '*.java'`
 fi
 
-dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes
-zip $TEST_NAME.jar classes.dex
+if [ ${NEED_DEX} = "true" ]; then
+  dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes
+  zip $TEST_NAME.jar classes.dex
+fi
 
 if [ -r src-ex ]; then
-    mkdir classes-ex
-    ${JAVAC} -d classes-ex -cp classes `find src-ex -name '*.java'`
+  mkdir classes-ex
+  ${JAVAC} -d classes-ex -cp classes `find src-ex -name '*.java'`
+  if [ ${NEED_DEX} = "true" ]; then
     dx -JXmx256m --debug --dex --dump-to=classes-ex.lst --output=classes-ex.dex --dump-width=1000 classes-ex
 
     # quick shuffle so that the stored name is "classes.dex"
@@ -38,4 +41,5 @@ if [ -r src-ex ]; then
     zip $TEST_NAME-ex.jar classes.dex
     mv classes.dex classes-ex.dex
     mv classes-1.dex classes.dex
+  fi
 fi
diff --git a/test/etc/reference-run-test-classes b/test/etc/reference-run-test-classes
index 0294cc2937..6f10f5a82c 100755
--- a/test/etc/reference-run-test-classes
+++ b/test/etc/reference-run-test-classes
@@ -58,4 +58,4 @@ if [ "$DEBUG" = "y" ]; then
     DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,address=$PORT,server=y,suspend=y"
 fi
 
-${JAVA} ${DEBUG_OPTS} -ea ${VERIFY_ARG} -classpath classes Main "$@"
+${JAVA} ${DEBUG_OPTS} ${VERIFY_ARG} -classpath classes Main "$@"
diff --git a/test/run-test b/test/run-test
index 7e99c04906..8f0d85bd23 100755
--- a/test/run-test
+++ b/test/run-test
@@ -40,6 +40,7 @@ export JAVAC="javac -g -target 1.5"
 export RUN="${progdir}/etc/push-and-run-test-jar"
 export IMAGE=${ANDROID_PRODUCT_OUT}/data/art-test/core.art
 export DEX_LOCATION=/data/run-test/${test_dir}
+export NEED_DEX="true"
 
 info="info.txt"
 build="build"
@@ -64,6 +65,7 @@ while true; do
         shift
     elif [ "x$1" = "x--jvm" ]; then
         RUN="${progdir}/etc/reference-run-test-classes"
+        NEED_DEX="false"
         shift
     elif [ "x$1" = "x-O" ]; then
         run_args="${run_args} -O"