diff options
| author | Alex Light <allight@google.com> | 2014-08-27 11:13:47 -0700 |
|---|---|---|
| committer | Alex Light <allight@google.com> | 2014-08-27 18:49:20 +0000 |
| commit | 1ef4ce87e54a595a67263e550916b97a1b468b99 (patch) | |
| tree | 134a4f661cef5d5dcd1f57e56bf44114c0e42a0d /test/etc | |
| parent | 469f2ee9a3c3d77f0352faed19d8c83c7397a638 (diff) | |
| download | art-1ef4ce87e54a595a67263e550916b97a1b468b99.tar.gz art-1ef4ce87e54a595a67263e550916b97a1b468b99.tar.bz2 art-1ef4ce87e54a595a67263e550916b97a1b468b99.zip | |
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
Diffstat (limited to 'test/etc')
| -rwxr-xr-x | test/etc/host-run-test-jar | 6 | ||||
| -rwxr-xr-x | test/etc/push-and-run-prebuilt-test-jar | 3 | ||||
| -rwxr-xr-x | test/etc/push-and-run-test-jar | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/test/etc/host-run-test-jar b/test/etc/host-run-test-jar index bce34f6d70..54a086574a 100755 --- a/test/etc/host-run-test-jar +++ b/test/etc/host-run-test-jar @@ -171,10 +171,8 @@ if [ "$INTERPRETER" = "y" ]; then fi if [ "$HAVE_IMAGE" = "n" ]; then - # Set image to a place were there isn't one and then set the bootclasspath - # so we can create it. - BOOT_OPT="-Ximage:/system/framework/boot.art" - BOOT_OPT="${BOOT_OPT} -Xbootclasspath:$ANDROID_HOST_OUT/../common/obj/JAVA_LIBRARIES/core-libart-hostdex_intermediates/javalib.jar" + # Set image to a place were there isn't one. + BOOT_OPT="-Ximage:/system/non-existant/core.art" fi if [ "$RELOCATE" = "y" ]; then diff --git a/test/etc/push-and-run-prebuilt-test-jar b/test/etc/push-and-run-prebuilt-test-jar index c1d407d7f3..91b8a0f805 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}") diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar index 9e63beddef..e398b5d58c 100755 --- a/test/etc/push-and-run-test-jar +++ b/test/etc/push-and-run-test-jar @@ -143,8 +143,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 if [ "$QUIET" = "n" ]; then |