From 1ef4ce87e54a595a67263e550916b97a1b468b99 Mon Sep 17 00:00:00 2001 From: Alex Light Date: Wed, 27 Aug 2014 11:13:47 -0700 Subject: 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 --- test/etc/push-and-run-prebuilt-test-jar | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/etc/push-and-run-prebuilt-test-jar') diff --git a/test/etc/push-and-run-prebuilt-test-jar b/test/etc/push-and-run-prebuilt-test-jar index c1d407d..91b8a0f 100755 --- a/test/etc/push-and-run-prebuilt-test-jar +++ b/test/etc/push-and-run-prebuilt-test-jar @@ -150,8 +150,7 @@ fi 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 ARCH=$(adb shell ls -F /data/dalvik-cache | grep -Ewo "${ARCHITECTURES_PATTERN}") -- cgit v1.1