Honor ART_TEST_ANDROID_ROOT in libcore and JDWP test scripts.
Test: Run libcore and JDWP tests on device with ART_TEST_ANDROID_ROOT defined.
Change-Id: Ied7f5bff3f83bcb21d4ab66ed8e0f860aadec252
diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index 739646a..2b7c624 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -28,6 +28,11 @@
JAVA_LIBRARIES=${ANDROID_PRODUCT_OUT}/../../common/obj/JAVA_LIBRARIES
fi
+android_root="/system"
+if [ -n "$ART_TEST_ANDROID_ROOT" ]; then
+ android_root="$ART_TEST_ANDROID_ROOT"
+fi
+
function classes_jar_path {
local var="$1"
local suffix="jar"
@@ -103,7 +108,7 @@
while true; do
if [[ "$1" == "--mode=device" ]]; then
vogar_args="$vogar_args --device-dir=/data/local/tmp"
- vogar_args="$vogar_args --vm-command=/data/local/tmp/system/bin/art"
+ vogar_args="$vogar_args --vm-command=$android_root/bin/art"
vogar_args="$vogar_args --vm-arg -Ximage:/data/art-test/core.art"
shift
elif [[ "$1" == "--mode=host" ]]; then