[Truffle] Use VERIFY_JRUBY for coverage.

jruby · Oct 13, 2015 · e3c3512 · e3c3512
1 parent bf3dffe
commit e3c3512
Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/bin/jruby.bash b/bin/jruby.bash
@@ -395,21 +395,13 @@ 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,13 +305,6 @@ 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 \
@@ -320,7 +313,6 @@ 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/coverage.sh b/test/truffle/java-coverage/coverage.sh
@@ -9,7 +9,7 @@ curl -L -O 'http://central.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.4.2
 JACOCO_AGENT=`pwd`/jacoco-agent.jar
 JACOCO_LOG=`pwd`/jacoco.exec
 
-export JRUBY_NO_BCP=1
+export VERIFY_JRUBY=1
 export JAVA_OPTS="-javaagent:$JACOCO_AGENT=destfile=$JACOCO_LOG"
 
 rm jacoco.exec