commit df09893c159f9314b832ddc1a6f0dfd374ef8a84
author Nicolas Geoffray <ngeoffray@google.com> Thu May 14 14:05:10 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 14 14:05:11 2015 +0000
tree 02eee1f69ea4f982fa393cb986f7f15e837f57e2
parent c8c6aa96bb9d484903391baa1a95bce86c057ae3
parent f4ff1d43fbb2cda4cf25ec1ea1b5bb43de29ee0d

Merge "Revert "Revert "Do not pass junit.jar to vogar."""

tools/run-jdwp-tests.sh

diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index 1dd443b..77e8004 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -21,11 +21,10 @@
 
 # Jar containing all the tests.
 test_jar=out/host/linux-x86/framework/apache-harmony-jdwp-tests-hostdex.jar
-junit_jar=out/host/linux-x86/framework/junit.jar
 
-if [ ! -f $test_jar -o ! -f $junit_jar ]; then
+if [ ! -f $test_jar ]; then
   echo "Before running, you must build jdwp tests and vogar:" \
-       "make junit apache-harmony-jdwp-tests-hostdex vogar vogar.jar"
+       "make apache-harmony-jdwp-tests-hostdex vogar vogar.jar"
   exit 1
 fi
 
@@ -80,7 +79,6 @@
       --vm-arg -Djpda.settings.transportAddress=127.0.0.1:55107 \
       --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 \
       --vm-arg -Xcompiler-option --vm-arg --debuggable \
       org.apache.harmony.jpda.tests.share.AllTests