commit 3185c8da1dc2c2497168817c083b3c9587ba0883
author Nicolas Geoffray <ngeoffray@google.com> Wed May 13 11:03:19 2015 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Wed May 13 11:03:19 2015 +0100
tree facc89f5a478d44c5391f88d6863362641c4ef6b
parent 70d3d1433ee3d33dfdc9f687c94383d527871455

Do not pass junit.jar to vogar.

Not needed after https://android-review.googlesource.com/#/c/150563.
Also dex2oat now complains about duplicated classes, and fallbacks
to the interpreter if it sees any. Since vogar has its own junit,
dex2oat was complaining.

Change-Id: I579feb0b1a049af3fba664fd2d86c67c66c8eae1

tools/run-jdwp-tests.sh

diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index 1dd443b..17c4556 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
   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