commit 68e25eb5bf2d6e4a253f0627a650e8b7419ad043
author Nicolas Geoffray <ngeoffray@google.com> Wed Oct 29 23:02:11 2014 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Oct 29 23:02:11 2014 +0000
tree 0023ebcc21ece161b236ca4b8a3c1bdcc0f92d65
parent 560473c74cc3755b652f86a61039e4a12c08afe2

Fix combination of prebuild/no-image.

Prebuild should always have an image. It's running the test
that should not.

Change-Id: I659514fba053c19edf13384ce061497d9b3a9e27

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 9b1af70..39f28c8 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -210,10 +210,8 @@
 
 if [ "$HAVE_IMAGE" = "n" ]; then
     DALVIKVM_BOOT_OPT="-Ximage:/system/non-existant/core.art"
-    DEX2OAT_BOOT_OPT="--boot-image=/system/non-existant/core.art"
 else
     DALVIKVM_BOOT_OPT="-Ximage:${BOOT_IMAGE}"
-    DEX2OAT_BOOT_OPT="--boot-image=${BOOT_IMAGE}"
 fi
 
 
@@ -272,7 +270,7 @@
 if [ "$PREBUILD" = "y" ]; then
   dex2oat_cmdline="$INVOKE_WITH $ANDROID_ROOT/bin/dex2oatd \
                       $COMPILE_FLAGS \
-                      $DEX2OAT_BOOT_OPT \
+                      --boot-image=${BOOT_IMAGE} \
                       --dex-file=$DEX_LOCATION/$TEST_NAME.jar \
                       --oat-file=$DEX_LOCATION/dalvik-cache/$ISA/$(echo $DEX_LOCATION/$TEST_NAME.jar/classes.dex | cut -d/ -f 2- | sed "s:/:@:g") \
                       --instruction-set=$ISA"