[Truffle] Java coverage tool.

jruby · Oct 13, 2015 · bf3dffe · bf3dffe
1 parent c437aec
commit bf3dffe
Showing 4 changed files with 65 additions and 0 deletions.
diff --git a/bin/jruby.bash b/bin/jruby.bash
@@ -395,13 +395,21 @@ else
     stty icanon echo > /dev/null 2>&1
 
     exit $JRUBY_STATUS
+  else
+  if [ "$JRUBY_NO_BCP" != "" ]; then
+    exec "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
+      "-Djruby.home=$JRUBY_HOME" \
+      "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
+      "-Djruby.shell=$JRUBY_SHELL" \
+      $java_class $mode "$@"
   else
     exec "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
       "-Djruby.home=$JRUBY_HOME" \
       "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
       "-Djruby.shell=$JRUBY_SHELL" \
       $java_class $mode "$@"
   fi
+  fi
 fi
 fi
 

diff --git a/bin/jruby.sh b/bin/jruby.sh
@@ -305,6 +305,13 @@ if [ "$VERIFY_JRUBY" != "" ]; then
 
 
   exit $JRUBY_STATUS
+else
+if [ "$JRUBY_NO_BCP" != "" ]; then
+  exec $JAVACMD $JAVA_OPTS $JFFI_OPTS ${java_args} -classpath $JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH \
+      -Djruby.home=$JRUBY_HOME \
+      -Djruby.lib=$JRUBY_HOME/lib -Djruby.script=jruby \
+      -Djruby.shell=$JRUBY_SHELL \
+      $java_class $JRUBY_OPTS $@
 else
   exec $JAVACMD $JAVA_OPTS $JFFI_OPTS ${java_args} -Xbootclasspath/a:$JRUBY_CP -classpath $CP$CP_DELIMITER$CLASSPATH \
       -Djruby.home=$JRUBY_HOME \
@@ -313,6 +320,7 @@ else
       $java_class $JRUBY_OPTS $@
 fi
 fi
+fi
 
 # Be careful adding code down here, you might override the exit
 # status of the jruby invocation.
diff --git a/test/truffle/java-coverage/build.xml b/test/truffle/java-coverage/build.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns:jacoco="antlib:org.jacoco.ant" default="jacoco">
+
+  <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
+    <classpath path="../../../asm-all-5.0.4.jar" />
+    <classpath path="../../../org.jacoco.core-0.7.4.201502262128.jar" />
+    <classpath path="../../../org.jacoco.ant-0.7.4.201502262128.jar" />
+    <classpath path="../../../org.jacoco.report-0.7.4.201502262128.jar" />
+  </taskdef>
+
+  <target name="jacoco">
+    <jacoco:report>
+      <executiondata>
+        <file file="../../../jacoco.exec" />
+      </executiondata>
+      <structure name="jacoco">
+        <classfiles>
+          <fileset file="../../../lib/jruby.jar" />
+          <fileset file="../../../lib/jruby-truffle.jar" />
+        </classfiles>
+        <sourcefiles encoding="UTF-8">
+          <fileset dir="../../../core/src/main/java" />
+          <fileset dir="../../../truffle/src/main/java" />
+        </sourcefiles>
+      </structure>
+      <html destdir="../../../jacoco" />
+    </jacoco:report>
+  </target>
+
+</project>
diff --git a/test/truffle/java-coverage/coverage.sh b/test/truffle/java-coverage/coverage.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+curl -L -o jacoco-agent.jar 'http://search.maven.org/remotecontent?filepath=org/jacoco/org.jacoco.agent/0.7.4.201502262128/org.jacoco.agent-0.7.4.201502262128-runtime.jar'
+curl -L -O 'http://central.maven.org/maven2/org/ow2/asm/asm-all/5.0.4/asm-all-5.0.4.jar'
+curl -L -O 'http://central.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.jar'
+curl -L -O 'http://central.maven.org/maven2/org/jacoco/org.jacoco.ant/0.7.4.201502262128/org.jacoco.ant-0.7.4.201502262128.jar'
+curl -L -O 'http://central.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.jar'
+
+JACOCO_AGENT=`pwd`/jacoco-agent.jar
+JACOCO_LOG=`pwd`/jacoco.exec
+
+export JRUBY_NO_BCP=1
+export JAVA_OPTS="-javaagent:$JACOCO_AGENT=destfile=$JACOCO_LOG"
+
+rm jacoco.exec
+tool/jt.rb test
+test/truffle/run.sh
+ant -f test/truffle/java-coverage/build.xml