[pkg-java] r17985 - trunk/jtreg/debian/patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-04-04 20:47:28 +0000 (Fri, 04 Apr 2014)
New Revision: 17985

Modified:
   trunk/jtreg/debian/patches/launchers.patch
Log:
Restored support for the JT_JAVA environment variable



Modified: trunk/jtreg/debian/patches/launchers.patch
===================================================================
--- trunk/jtreg/debian/patches/launchers.patch	2014-04-04 19:20:48 UTC (rev 17984)
+++ trunk/jtreg/debian/patches/launchers.patch	2014-04-04 20:47:28 UTC (rev 17985)
@@ -69,19 +69,19 @@
 -elif [ "$version" -lt 5 ]; then
 -    echo "java version 5 or later is required to run jtdiff"
 -    exit 1;
-+# Directory where jtreg is
-+if [ -z "${JTREG_HOME}" ]; then
-+    JTREG_HOME="/usr/share/java"
++# Java home directory
++if [ -z "${JT_JAVA}" ]; then
++    JT_JAVA="/usr/lib/jvm/default-java"
  fi
  
  # And finally ...
  
-+JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
++JT_CLASSPATH="/usr/share/java/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
 +
  IFS=$nl
  
 -"${JT_JAVA:-${JAVA_HOME:+$JAVA_HOME/bin/}java}" \
-+/usr/bin/java \
++"${JT_JAVA}"/bin/java \
      $javaOpts \
      -Dprogram=`basename "$0"` \
 -    -cp "${JT_HOME}/lib/jtreg.jar" \
@@ -158,19 +158,19 @@
 -elif [ "$version" -lt 5 ]; then
 -    echo "java version 5 or later is required to run jtreg"
 -    exit 1;
-+# Directory where jtreg is
-+if [ -z "${JTREG_HOME}" ]; then
-+    JTREG_HOME="/usr/share/java"
++# Java home directory
++if [ -z "${JT_JAVA}" ]; then
++    JT_JAVA="/usr/lib/jvm/default-java"
  fi
  
  # And finally ...
  
-+JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar:/usr/share/java/testng.jar:/usr/share/java/jcommander.jar"
++JT_CLASSPATH="/usr/share/java/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
 +
  IFS=$nl
  
 -"${JT_JAVA}" \
-+/usr/bin/java \
++"${JT_JAVA}"/bin/java \
      $javaOpts \
      -Dprogram=`basename "$0"` \
 -    -jar "${JT_HOME}/lib/jtreg.jar" \