Codebase list jtreg / e87635f
Refreshed the patches Emmanuel Bourg 5 years ago
3 changed file(s) with 28 addition(s) and 16 deletion(s). Raw diff Collapse all Expand all
+8
-0
debian/changelog less more
0 jtreg (4.2-b14-1) UNRELEASED; urgency=medium
1
2 * Team upload.
3 * New upstream release
4 - Refreshed the patches
5
6 -- Emmanuel Bourg <ebourg@apache.org> Mon, 25 Feb 2019 12:42:46 +0100
7
08 jtreg (4.2-b13-2) unstable; urgency=medium
19
210 * Team upload.
+4
-4
debian/patches/add-jcommander-to-classpath.patch less more
33 Forwarded: no
44 --- a/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java
55 +++ b/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java
6 @@ -558,6 +558,7 @@
6 @@ -556,6 +556,7 @@
77 .append(jdk.getJDKClassPath())
88 .append(script.getJUnitPath())
99 .append(script.getTestNGPath())
1313 SearchPath classpath = paths.get(PathKind.CLASSPATH);
1414 --- a/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
1515 +++ b/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
16 @@ -732,16 +732,20 @@
16 @@ -771,16 +771,20 @@
1717 File md = workDir.getFile("modules");
1818 if (needJUnit)
1919 install(params.getJUnitPath(), md);
3636 }
3737
3838 // Extras:
39 @@ -833,8 +837,10 @@
39 @@ -872,8 +876,10 @@
4040 File md = workDir.getFile("modules");
4141 if (needJUnit)
4242 install(params.getJUnitPath(), md);
4848 mp.append(md);
4949 }
5050 } else {
51 @@ -842,8 +848,10 @@
51 @@ -881,8 +887,10 @@
5252 if (needJUnit)
5353 fp.append(params.getJUnitPath());
5454
+16
-12
debian/patches/launchers.patch less more
9292 $jtdiffOpts
9393 --- a/src/share/bin/jtreg.sh
9494 +++ b/src/share/bin/jtreg.sh
95 @@ -47,40 +47,6 @@
96 #
97 # jtreg also provides Ant tasks; see the documentation for details.
95 @@ -68,36 +68,6 @@
96 esac
97
9898
9999 -# Determine jtreg/JavaTest installation directory
100100 -if [ -n "$JT_HOME" ]; then
105105 -else
106106 - # Deduce where script is installed
107107 - # - should work on most derivatives of Bourne shell, like ash, bash, ksh,
108 - # sh, zsh, etc, including on Windows, MKS (ksh) and Cygwin (ash or bash)
108 - # sh, zsh, etc, including on Windows, MKS (ksh), Cygwin (ash or bash)
109 - # and Windows Subsystem for Linux (WSL)
109110 - if type -p type 1>/dev/null 2>&1 && test -z "`type -p type`" ; then
110111 - myname=`type -p "$0"`
111112 - elif type type 1>/dev/null 2>&1 ; then
124125 - fi
125126 -fi
126127 -
127 -# Normalize JT_HOME if using Cygwin
128 -case "`uname -s`" in
129 - CYGWIN* ) cygwin=1 ; JT_HOME=`cygpath -a -m "$JT_HOME"` ;;
130 -esac
131128 -
132 -
133 # Separate out -J* options for the JVM
134 # Note jdk as possible default to run jtreg
129 # Look for -jdk option as possible default to run jtreg
135130 # Unset IFS and use newline as arg separator to preserve spaces in args
136 @@ -101,37 +67,24 @@
131 DUALCASE=1 # for MKS: make case statement case-sensitive (6709498)
132 @@ -113,17 +83,9 @@
137133 done
138134 unset DUALCASE
139135
153149 + JT_JAVA="/usr/lib/jvm/default-java"
154150 fi
155151
152 # Fixup JT_JAVA, JTHOME as needed, if using Cygwin or WSL
153 @@ -134,16 +96,8 @@
154 JT_HOME=`wslpath -a -m "$JT_HOME"`
155 fi
156
156157 -# Verify java version (1.)7 or newer used to run jtreg
157158 -version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.agent.GetSystemProperty java.version 2>&1 |
158159 - grep 'java.version=' | sed -e 's/^.*=//' -e 's/^1\.//' -e 's/\([1-9][0-9]*\).*/\1/'`
166167 +if [ -z "${JT_HOME}" ] || [ ! -f "${JT_HOME}/jtreg.jar" ]; then
167168 + JT_HOME="/usr/share/java"
168169 fi
170
171 # Separate out -J* options for the JVM
172 @@ -170,10 +124,13 @@
169173
170174 # And finally ...
171175