summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2015-04-24 14:37:29 +0100
committerNicolas Geoffray <ngeoffray@google.com>2015-04-24 14:37:29 +0100
commit33e1f8fbd4e1269add02b3288a903092d0fb8258 (patch)
treee3ac9ed7e2f50fe5d45edf15cfe35bbb51ffd410 /tools
parent9e85d55c085504b88a9ac68c3f9605629dc06853 (diff)
downloadart-33e1f8fbd4e1269add02b3288a903092d0fb8258.zip
art-33e1f8fbd4e1269add02b3288a903092d0fb8258.tar.gz
art-33e1f8fbd4e1269add02b3288a903092d0fb8258.tar.bz2
Don't use 'sh' on the host.
Change-Id: I319c08367d143443425bc01f4dda28ad46417c7e
Diffstat (limited to 'tools')
-rwxr-xr-xtools/run-jdwp-tests.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index a7a3428..a007fa2 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -35,6 +35,7 @@ if [ ! -f $test_jar -o ! -f $junit_jar ]; then
fi
art="/data/local/tmp/system/bin/art"
+art_debugee="sh /data/local/tmp/system/bin/art"
# We use Quick's image on target because optimizing's image is not compiled debuggable.
image="-Ximage:/data/art-test/core.art"
args=$@
@@ -50,6 +51,7 @@ while true; do
# Specify bash explicitly since the art script cannot, since it has to run on the device
# with mksh.
art="bash out/host/linux-x86/bin/art"
+ art_debugee="bash out/host/linux-x86/bin/art"
# We force generation of a new image to avoid build-time and run-time classpath differences.
image="-Ximage:/system/non/existent"
# We do not need a device directory on host.
@@ -81,7 +83,7 @@ vogar $vm_command \
--vm-arg -Djpda.settings.verbose=true \
--vm-arg -Djpda.settings.syncPort=34016 \
--vm-arg -Djpda.settings.transportAddress=127.0.0.1:55107 \
- --vm-arg -Djpda.settings.debuggeeJavaPath="\"sh $art $image $debuggee_args\"" \
+ --vm-arg -Djpda.settings.debuggeeJavaPath="\"$art_debugee $image $debuggee_args\"" \
--classpath $test_jar \
--classpath $junit_jar \
--vm-arg -Xcompiler-option --vm-arg --compiler-backend=Optimizing \