Codebase list jtreg / ea50370
Refreshed the patches Emmanuel Bourg 7 years ago
3 changed file(s) with 31 addition(s) and 23 deletion(s). Raw diff Collapse all Expand all
+8
-0
debian/changelog less more
0 jtreg (4.2-b03-1~exp1) UNRELEASED; urgency=medium
1
2 * Team upload.
3 * New upstream release
4 - Refreshed the patches
5
6 -- Emmanuel Bourg <ebourg@apache.org> Sun, 04 Sep 2016 23:04:56 +0200
7
08 jtreg (4.2-b02-1~exp1) experimental; urgency=medium
19
210 * Team upload.
+20
-20
debian/patches/add-jcommander-to-classpath.patch less more
33 Forwarded: no
44 --- a/src/share/classes/com/sun/javatest/regtest/MainAction.java
55 +++ b/src/share/classes/com/sun/javatest/regtest/MainAction.java
6 @@ -540,6 +540,7 @@
6 @@ -553,6 +553,7 @@
77 .append(jdk.getJDKClassPath())
8 .append(script.getJUnitJar())
9 .append(script.getTestNGJar())
10 + .append(new File("/usr/share/java/jcommander.jar"))
11 .split();
8 .append(script.getJUnitPath())
9 .append(script.getTestNGPath())
10 + .append(new SearchPath("/usr/share/java/jcommander.jar"))
11 .asList();
1212
1313 SearchPath classpath = paths.get(PathKind.CLASSPATH);
1414 --- a/src/share/classes/com/sun/javatest/regtest/RegressionScript.java
1515 +++ b/src/share/classes/com/sun/javatest/regtest/RegressionScript.java
16 @@ -692,16 +692,20 @@
16 @@ -700,16 +700,20 @@
1717 File md = workDir.getFile("modules");
1818 if (needJUnit)
19 install(params.getJUnitJar(), md);
19 install(params.getJUnitPath(), md);
2020 - if (needTestNG)
2121 + if (needTestNG) {
22 install(params.getTestNGJar(), md);
23 + install(new File("/usr/share/java/jcommander.jar"), md);
22 install(params.getTestNGPath(), md);
23 + install(new SearchPath("/usr/share/java/jcommander.jar"), md);
2424 + }
2525 mp.append(md);
2626 }
2727 } else {
2828 if (needJUnit)
29 cp.append(params.getJUnitJar());
29 cp.append(params.getJUnitPath());
3030
3131 - if (needTestNG)
3232 + if (needTestNG) {
33 cp.append(params.getTestNGJar());
34 + cp.append(new File("/usr/share/java/jcommander.jar"));
33 cp.append(params.getTestNGPath());
34 + cp.append(new SearchPath("/usr/share/java/jcommander.jar"));
3535 + }
3636 }
3737
3838 // Extras:
39 @@ -793,8 +797,10 @@
39 @@ -801,8 +805,10 @@
4040 File md = workDir.getFile("modules");
4141 if (needJUnit)
42 install(params.getJUnitJar(), md);
42 install(params.getJUnitPath(), md);
4343 - if (needTestNG)
4444 + if (needTestNG) {
45 install(params.getTestNGJar(), md);
46 + install(new File("/usr/share/java/jcommander.jar"), md);
45 install(params.getTestNGPath(), md);
46 + install(new SearchPath("/usr/share/java/jcommander.jar"), md);
4747 + }
4848 mp.append(md);
4949 }
5050 } else {
51 @@ -802,8 +808,10 @@
51 @@ -810,8 +816,10 @@
5252 if (needJUnit)
53 fp.append(params.getJUnitJar());
53 fp.append(params.getJUnitPath());
5454
5555 - if (needTestNG)
5656 + if (needTestNG) {
57 fp.append(params.getTestNGJar());
58 + fp.append(new File("/usr/share/java/jcommander.jar"));
57 fp.append(params.getTestNGPath());
58 + fp.append(new SearchPath("/usr/share/java/jcommander.jar"));
5959 + }
6060 }
6161
+3
-3
debian/patches/launchers.patch less more
153153 + JT_JAVA="/usr/lib/jvm/default-java"
154154 fi
155155
156 -# Verify java version (1.)5 or newer used to run jtreg
156 -# Verify java version (1.)7 or newer used to run jtreg
157157 -version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.agent.GetSystemProperty java.version 2>&1 |
158158 - grep 'java.version=' | sed -e 's/^.*=//' -e 's/^1\.//' -e 's/\([1-9][0-9]*\).*/\1/'`
159159 -
160160 -if [ -z "$version" ]; then
161161 - echo "Cannot determine version of java to run jtreg"
162162 - exit 1;
163 -elif [ "$version" -lt 5 ]; then
164 - echo "java version 5 or later is required to run jtreg"
163 -elif [ "$version" -lt 7 ]; then
164 - echo "java version 7 or later is required to run jtreg"
165165 - exit 1;
166166 +if [ -z "${JT_HOME}" ] || [ ! -f "${JT_HOME}/jtreg.jar" ]; then
167167 + JT_HOME="/usr/share/java"