commit 1c36188675779155ea145066c0ae341fbb0ace4f
author Roland Levillain <rpl@google.com> Fri Mar 02 14:23:51 2018 +0000
committer Roland Levillain <rpl@google.com> Fri Mar 02 14:31:08 2018 +0000
tree f53541798ef676551cc85926f16b1bfd1bfc906a
parent 700ef3d1ada8cd2f67932edf94858e472edee3ea

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

tools/run-jdwp-tests.sh

diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index c58411c..53c6fb6 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -26,12 +26,17 @@
   ANDROID_HOST_OUT=${OUT_DIR-$ANDROID_BUILD_TOP/out}/host/linux-x86
 fi
 
+android_root="/system"
+if [ -n "$ART_TEST_ANDROID_ROOT" ]; then
+  android_root="$ART_TEST_ANDROID_ROOT"
+fi
+
 java_lib_location="${ANDROID_HOST_OUT}/../common/obj/JAVA_LIBRARIES"
 make_target_name="apache-harmony-jdwp-tests-hostdex"
 
 vm_args=""
-art="/data/local/tmp/system/bin/art"
-art_debugee="sh /data/local/tmp/system/bin/art"
+art="$android_root/bin/art"
+art_debugee="sh $android_root/bin/art"
 args=$@
 debuggee_args="-Xcompiler-option --debuggable"
 device_dir="--device-dir=/data/local/tmp"

tools/run-libcore-tests.sh

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