Commit 16ee8e6242a4dee1ace3e1420cbc05c3d135b410 - jtreg

apply patch for wrapper script Thank you to Tiago Stürmer Daitx for the patch Gbp-Dch: ignore tony mancill 3 years ago

1 changed file(s) with 8 addition(s) and 7 deletion(s). Raw diff Collapse all Expand all

-7

debian/patches/launchers.patch less more

24	24	# Verify java version (1.)5 or newer used to run jtdiff
25	25	--- a/src/share/bin/jtreg.sh
26	26	+++ b/src/share/bin/jtreg.sh
27		@@ -98,6 +98,9 @@
28		fi
29		fi
	27	@@ -70,6 +70,10 @@
30	28
	29	# Determine jtreg installation directory
	30	JTREG_HOME=${JTREG_HOME:-$JT_HOME} # allow for old version of name
31	31	+if [ -z "${JTREG_HOME}" ]; then
32	32	+ JTREG_HOME="/usr/share/jtreg"
33	33	+fi
34
35		# Look for -jdk option as possible default to run jtreg
36		# Unset IFS and use newline as arg separator to preserve spaces in args
37		@@ -125,7 +128,7 @@
	34	+
	35	if [ -n "$JTREG_HOME" ]; then
	36	if [ ! -r $JTREG_HOME/lib/jtreg.jar ];then
	37	echo "Invalid JTREG_HOME=$JTREG_HOME. Cannot find or read $JTREG_HOME/lib/jtreg.jar"
	38	@@ -125,7 +129,7 @@
38	39	elif [ -n "$jdk" ]; then
39	40	JTREG_JAVA="$jdk/bin/java"
40	41	else