diff options
| author | 2022-02-18 14:17:31 +0000 | |
|---|---|---|
| committer | 2022-02-18 14:24:37 +0000 | |
| commit | 45c6d8b52c522fb1be39b169596cf81815aba5db (patch) | |
| tree | bc3353d0aab0523e79e461ce972aa837d553adcb | |
| parent | 76c01df08ce2090e03672b80440e2a25f9f648a6 (diff) | |
Fix the scripts for libjdwp tests and libcore tests to find the image.
Bug: 216467764
Test: art/tools/run-libjdwp-tests.sh --mode=device --variant=X64
Test: art/tools/run-libcore-tests.sh --mode=device --variant=X64
Change-Id: I3a0a11be614f3351271a1d1febbc6305dc79bdcd
| -rwxr-xr-x | tools/run-jdwp-tests.sh | 2 | ||||
| -rwxr-xr-x | tools/run-libcore-tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh index 4d6e13562b..fec969c870 100755 --- a/tools/run-jdwp-tests.sh +++ b/tools/run-jdwp-tests.sh @@ -72,7 +72,7 @@ plugin="" debug="no" explicit_debug="no" verbose="no" -image="-Ximage:/apex/com.android.art/javalib/boot.art" +image="-Ximage:/system/framework/art_boot_images/boot.art" boot_classpath="$(boot_classpath_arg /apex/com.android.art/javalib "" $BOOT_CLASSPATH_JARS)" boot_classpath_locations="" with_jdwp_path="" diff --git a/tools/run-libcore-tests.py b/tools/run-libcore-tests.py index 3ce18d28f6..99a6a74588 100755 --- a/tools/run-libcore-tests.py +++ b/tools/run-libcore-tests.py @@ -154,7 +154,7 @@ def get_test_names(): def get_vogar_command(test_name): cmd = ["vogar"] if args.mode == "device": - cmd.append("--mode=device --vm-arg -Ximage:/apex/com.android.art/javalib/boot.art") + cmd.append("--mode=device --vm-arg -Ximage:/system/framework/art_boot_images/boot.art") cmd.append("--vm-arg -Xbootclasspath:" + ":".join(BOOT_CLASSPATH)) if args.mode == "host": # We explicitly give a wrong path for the image, to ensure vogar |