[jtreg] 02/03: Refreshed the patches

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jtreg.

commit 16ad31fa0860eae6a0881bf78600fdb711dfa215
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 20 13:11:29 2016 +0200

    Refreshed the patches
---
 debian/changelog                                 |   4 +-
 debian/patches/add-jcommander-to-classpath.patch | 101 +++++++++++------------
 2 files changed, 50 insertions(+), 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3266581..6ebbfc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-jtreg (4.1-b12-2) UNRELEASED; urgency=medium
+jtreg (4.2-b01-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Standards-Version updated to 3.9.8 (no changes)
   * Use secure Vcs-* URLs
 
diff --git a/debian/patches/add-jcommander-to-classpath.patch b/debian/patches/add-jcommander-to-classpath.patch
index f48787d..a6e76ad 100644
--- a/debian/patches/add-jcommander-to-classpath.patch
+++ b/debian/patches/add-jcommander-to-classpath.patch
@@ -4,67 +4,60 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/src/share/classes/com/sun/javatest/regtest/MainAction.java
 +++ b/src/share/classes/com/sun/javatest/regtest/MainAction.java
-@@ -344,8 +344,10 @@
-         SearchPath p = bcp.isEmpty() ? cp : bcp;
-         if (script.isJUnitRequired())
-             p.append(script.getJUnitJar());
--        if (script.isTestNGRequired())
-+        if (script.isTestNGRequired()) {
-             p.append(script.getTestNGJar());
-+            p.append(new File("/usr/share/java/jcommander.jar"));
-+        }
+@@ -535,6 +535,7 @@
+                 .append(jdk.getJDKClassPath())
+                 .append(script.getJUnitJar())
+                 .append(script.getTestNGJar())
++                .append(new File("/usr/share/java/jcommander.jar"))
+                 .split();
  
-         if (useCLASSPATH && !cp.isEmpty()) {
-             env.put("CLASSPATH", cp.toString());
-@@ -475,8 +477,10 @@
-         SearchPath rcp = new SearchPath(script.getJavaTestClassPath(), script.getTestJDK().getJDKClassPath());
-         if (script.isJUnitRequired())
-             rcp.append(script.getJUnitJar());
--        if (script.isTestNGRequired())
-+        if (script.isTestNGRequired()) {
-             rcp.append(script.getTestNGJar());
-+            rcp.append(new File("/usr/share/java/jcommander.jar"));
-+        }
-         rcp.append(runClasspath);
-         List<String> javaArgs = Arrays.asList("-classpath", rcp.toString());
-         recorder.java(script.getEnvVars(), javaProg, javaProps, javaArgs, runMainClass, runMainArgs);
-@@ -526,8 +530,10 @@
-         SearchPath classpath = new SearchPath(script.getJavaTestClassPath(), jdk.getJDKClassPath());
-         if (script.isJUnitRequired())
-             classpath.append(script.getJUnitJar());
--        if (script.isTestNGRequired())
-+        if (script.isTestNGRequired()) {
-             classpath.append(script.getTestNGJar());
-+            classpath.append(new File("/usr/share/java/jcommander.jar"));
-+        }
- 
-         String javaProg = script.getJavaProg();
-         SearchPath rcp = new SearchPath(classpath, runClasspath);
+         SearchPath classpath = paths.get(PathKind.CLASSPATH);
 --- a/src/share/classes/com/sun/javatest/regtest/RegressionScript.java
 +++ b/src/share/classes/com/sun/javatest/regtest/RegressionScript.java
-@@ -574,8 +574,10 @@
+@@ -671,16 +671,20 @@
+                 File md = workDir.getFile("modules");
+                 if (needJUnit)
+                     install(params.getJUnitJar(), md);
+-                if (needTestNG)
++                if (needTestNG) {
+                     install(params.getTestNGJar(), md);
++                    install(new File("/usr/share/java/jcommander.jar"), md);
++                }
+                 mp.append(md);
+             }
+         } else {
              if (needJUnit)
-                 cacheCompileClassPath.append(params.getJUnitJar());
+                 cp.append(params.getJUnitJar());
  
 -            if (needTestNG)
 +            if (needTestNG) {
-                 cacheCompileClassPath.append(params.getTestNGJar());
-+                cacheCompileClassPath.append(new File("/usr/share/java/jcommander.jar"));
+                 cp.append(params.getTestNGJar());
++                cp.append(new File("/usr/share/java/jcommander.jar"));
 +            }
+         }
+ 
+         // Extras:
+@@ -772,8 +776,10 @@
+                 File md = workDir.getFile("modules");
+                 if (needJUnit)
+                     install(params.getJUnitJar(), md);
+-                if (needTestNG)
++                if (needTestNG) {
+                     install(params.getTestNGJar(), md);
++                    install(new File("/usr/share/java/jcommander.jar"), md);
++                }
+                 mp.append(md);
+             }
+         } else {
+@@ -781,8 +787,10 @@
+             if (needJUnit)
+                 fp.append(params.getJUnitJar());
  
-             // handle cpa option to jtreg
-             Map<String, String> envVars = getEnvVars();
---- a/src/share/classes/com/sun/javatest/regtest/Main.java
-+++ b/src/share/classes/com/sun/javatest/regtest/Main.java
-@@ -1628,8 +1628,10 @@
-             classpath.add(childTools);
-         if (junit_jar.exists())
-             classpath.add(junit_jar);
--        if (testng_jar.exists())
-+        if (testng_jar.exists()) {
-             classpath.add(testng_jar);
-+            classpath.add(new File("/usr/share/java/jcommander.jar"));
-+        }
-         classpath.addAll(classPathAppendArg);
-         c.add(filesToAbsolutePath(classpath).toString());
+-            if (needTestNG)
++            if (needTestNG) {
+                 fp.append(params.getTestNGJar());
++                fp.append(new File("/usr/share/java/jcommander.jar"));
++            }
+         }
  
+         // Extras:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jtreg.git