diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-12-07 07:51:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-07 07:51:00 +0000 |
| commit | a9a0973ff03ce2c2d1ec65695ad0f4cd8ed170a7 (patch) | |
| tree | 9f00efead2c694b2a590f8c4890a9052571bbcff /tools | |
| parent | 260a50cb43618dfdd325e7c89745d8bc38b20292 (diff) | |
| parent | d19085141ad9c71eae1b0ff585999ac8e27dadd4 (diff) | |
| download | art-a9a0973ff03ce2c2d1ec65695ad0f4cd8ed170a7.tar.gz art-a9a0973ff03ce2c2d1ec65695ad0f4cd8ed170a7.tar.bz2 art-a9a0973ff03ce2c2d1ec65695ad0f4cd8ed170a7.zip | |
Merge "Pass boot class path to ImageSpace::LoadBootImage."
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run-libcore-tests.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index 2d39b2a9f8..63f1fce13f 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -46,6 +46,21 @@ function cparg { done } +function boot_classpath_arg { + local dir="$1" + local suffix="$2" + shift 2 + printf -- "--vm-arg -Xbootclasspath" + for var + do + printf -- ":${dir}/${var}${suffix}.jar"; + done +} + +# Note: This must match the TEST_CORE_JARS in Android.common_path.mk +# because that's what we use for compiling the core.art image. +BOOT_CLASSPATH_JARS="core-oj core-libart core-simple conscrypt okhttp bouncycastle" + DEPS="core-tests jsr166-tests mockito-target" for lib in $DEPS @@ -110,6 +125,7 @@ while true; do if [[ "$1" == "--mode=device" ]]; then device_mode=true vogar_args="$vogar_args --vm-arg -Ximage:/data/art-test/core.art" + vogar_args="$vogar_args $(boot_classpath_arg /system/framework -testdex $BOOT_CLASSPATH_JARS)" shift elif [[ "$1" == "--mode=host" ]]; then # We explicitly give a wrong path for the image, to ensure vogar |