Really fix tests.
Remove extra line in Android.run-test.mk.
Update junit code in 082 and 021.
Set correct bootclasspath for --no-image.
Make host core.art depend on dex files being installed.
Make 118 pass in the correct bootclasspath.
Bug: 17290452
Change-Id: I415eddfa3632ec7eda927abe95925202de193749
diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar
index 9e63bed..e398b5d 100755
--- a/test/etc/push-and-run-test-jar
+++ b/test/etc/push-and-run-test-jar
@@ -143,8 +143,7 @@
msg "------------------------------"
if [ "$HAVE_IMAGE" = "n" ]; then
- BOOT_OPT="-Ximage:/system/non-existant/boot.art"
- BOOT_OPT="${BOOT_OPT} -Xbootclasspath:/system/framework/core-libart.jar"
+ BOOT_OPT="-Ximage:/system/non-existant/core.art"
fi
if [ "$QUIET" = "n" ]; then