From f4ff1d43fbb2cda4cf25ec1ea1b5bb43de29ee0d Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 14 May 2015 14:03:51 +0000 Subject: [PATCH] Revert "Revert "Do not pass junit.jar to vogar."" This reverts commit 5bf24f3d8633efda0b20126be411c2cfa4e75097. Change-Id: I5512c57e7b725991468e9d08d8110df5809dc854 --- tools/run-jdwp-tests.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh index 1dd443b2b..77e800411 100755 --- a/tools/run-jdwp-tests.sh +++ b/tools/run-jdwp-tests.sh @@ -21,11 +21,10 @@ fi # 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 @@ vogar $vm_command \ --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 -- 2.11.0