commit 84f2632f6e1e28449a566d44da7dba23bf44fcf7
author Igor Murashkin <iam@google.com> Tue Jun 06 11:36:33 2017 -0700
committer Igor Murashkin <iam@google.com> Mon Jun 12 16:30:22 2017 -0700
tree e576b4b9807bc3f0d6fd7d1e453dd5a26c28b96c
parent 0a50965275df2da590c49a7a955e6ff5a7c7d2ae

tools: Allow testing with javac on buildbot

By running these scripts with 'ANDROID_COMPILE_WITH_JACK=false',
they will instead use javac/desugar/dx to compile the .java files.

Test: art/tools/buildbot-build.sh && art/tools/run-jdwp-tests.sh --mode=host
Test: art/tools/buildbot-build.sh && art/tools/run-libcore-tests.sh --mode=device
Test: art/tools/buildbot-build.sh && art/tools/run-libcore-tests.sh --mode=host
Bug: 36902714
Bug: 37461882
Change-Id: I118d3ec2a3fa31bf85cdcef63d2772df26e07c5e

tools/run-jdwp-tests.sh

diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index d48d857..f742767 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -23,10 +23,24 @@
   ANDROID_HOST_OUT=${OUT_DIR-$ANDROID_BUILD_TOP/out}/host/linux-x86
 fi
 
-# Jar containing all the tests.
-test_jack=${ANDROID_HOST_OUT}/../common/obj/JAVA_LIBRARIES/apache-harmony-jdwp-tests-hostdex_intermediates/classes.jack
+using_jack=true
+if [[ $ANDROID_COMPILE_WITH_JACK == false ]]; then
+  using_jack=false
+fi
 
-if [ ! -f $test_jack ]; then
+function jlib_suffix {
+  local str=$1
+  local suffix="jar"
+  if $using_jack; then
+    suffix="jack"
+  fi
+  echo "$str.$suffix"
+}
+
+# Jar containing all the tests.
+test_jar=$(jlib_suffix "${ANDROID_HOST_OUT}/../common/obj/JAVA_LIBRARIES/apache-harmony-jdwp-tests-hostdex_intermediates/classes")
+
+if [ ! -f $test_jar ]; then
   echo "Before running, you must build jdwp tests and vogar:" \
        "make apache-harmony-jdwp-tests-hostdex vogar"
   exit 1
@@ -147,6 +161,12 @@
   art_debugee="$art_debugee -verbose:jdwp"
 fi
 
+if $using_jack; then
+  toolchain_args="--toolchain jack --language JN --jack-arg -g"
+else
+  toolchain_args="--toolchain jdk --language CUR"
+fi
+
 # Run the tests using vogar.
 vogar $vm_command \
       $vm_args \
@@ -160,10 +180,9 @@
       --vm-arg -Djpda.settings.waitingTime=$jdwp_test_timeout \
       --vm-arg -Djpda.settings.transportAddress=127.0.0.1:55107 \
       --vm-arg -Djpda.settings.debuggeeJavaPath="$art_debugee $image $debuggee_args" \
-      --classpath $test_jack \
-      --toolchain jack --language JN \
+      --classpath "$test_jar" \
+      $toolchain_args \
       --vm-arg -Xcompiler-option --vm-arg --debuggable \
-      --jack-arg -g \
       $test
 
 vogar_exit_status=$?