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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-04-29 22:08:47 +0000 (Tue, 29 Apr 2014)
New Revision: 18105

Modified:
   trunk/jtreg/debian/patches/launchers.patch
Log:
Restored the JTREG_HOME variable in the launcher scripts



Modified: trunk/jtreg/debian/patches/launchers.patch
===================================================================
--- trunk/jtreg/debian/patches/launchers.patch	2014-04-29 14:33:27 UTC (rev 18104)
+++ trunk/jtreg/debian/patches/launchers.patch	2014-04-29 22:08:47 UTC (rev 18105)
@@ -44,7 +44,7 @@
  # Separate out -J* options for the JVM
  # Unset IFS and use newline as arg separator to preserve spaces in args
  DUALCASE=1  # for MKS: make case statement case-sensitive (6709498)
-@@ -88,36 +54,20 @@
+@@ -88,36 +54,25 @@
  done
  unset DUALCASE
  
@@ -57,8 +57,11 @@
 -    JT_JAVA="$JAVA_HOME/bin/java"
 -else
 -    JT_JAVA=java
--fi
--
++# Java home directory
++if [ -z "${JT_JAVA}" ]; then
++    JT_JAVA="/usr/lib/jvm/default-java"
+ fi
+ 
 -# Verify java version (1.)5 or newer used to run jtdiff
 -version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.GetSystemProperty java.version 2>&1 |
 -        grep 'java.version=' | sed -e 's/^.*=//' -e 's/^1\.//' -e 's/\([1-9][0-9]*\).*/\1/'`
@@ -69,14 +72,14 @@
 -elif [ "$version" -lt 5 ]; then
 -    echo "java version 5 or later is required to run jtdiff"
 -    exit 1;
-+# Java home directory
-+if [ -z "${JT_JAVA}" ]; then
-+    JT_JAVA="/usr/lib/jvm/default-java"
++if [ -z "${JTREG_HOME}" ]; then
++    JT_HOME="/usr/share/java"
  fi
  
++
  # And finally ...
  
-+JT_CLASSPATH="/usr/share/java/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
++JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
 +
  IFS=$nl
  
@@ -131,7 +134,7 @@
  # Separate out -J* options for the JVM
  # Note jdk as possible default to run jtreg
  # Unset IFS and use newline as arg separator to preserve spaces in args
-@@ -102,37 +68,20 @@
+@@ -102,37 +68,24 @@
  done
  unset DUALCASE
  
@@ -146,8 +149,11 @@
 -    JT_JAVA="$jdk/bin/java"
 -else
 -    JT_JAVA=java
--fi
--
++# Java home directory
++if [ -z "${JT_JAVA}" ]; then
++    JT_JAVA="/usr/lib/jvm/default-java"
+ fi
+ 
 -# Verify java version (1.)5 or newer used to run jtreg
 -version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.GetSystemProperty java.version 2>&1 |
 -        grep 'java.version=' | sed -e 's/^.*=//' -e 's/^1\.//' -e 's/\([1-9][0-9]*\).*/\1/'`
@@ -158,14 +164,13 @@
 -elif [ "$version" -lt 5 ]; then
 -    echo "java version 5 or later is required to run jtreg"
 -    exit 1;
-+# Java home directory
-+if [ -z "${JT_JAVA}" ]; then
-+    JT_JAVA="/usr/lib/jvm/default-java"
++if [ -z "${JTREG_HOME}" ]; then
++    JT_HOME="/usr/share/java"
  fi
  
  # And finally ...
  
-+JT_CLASSPATH="/usr/share/java/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
++JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
 +
  IFS=$nl