[pkg-java] r17983 - in trunk/jtreg/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-04-04 15:29:55 +0000 (Fri, 04 Apr 2014)
New Revision: 17983

Added:
   trunk/jtreg/debian/patches/add-jcommander-to-classpath.patch
Modified:
   trunk/jtreg/debian/changelog
   trunk/jtreg/debian/patches/series
Log:
Add jcommander.jar to the classpaths built internally by jtreg



Modified: trunk/jtreg/debian/changelog
===================================================================
--- trunk/jtreg/debian/changelog	2014-04-04 13:47:56 UTC (rev 17982)
+++ trunk/jtreg/debian/changelog	2014-04-04 15:29:55 UTC (rev 17983)
@@ -4,6 +4,8 @@
   * New upstream release
     - Refreshed launchers.patch
     - New build dependency on testng
+    - Added a patch to add jcommander.jar to the classpaths built internally
+      by jtreg
   * Replaced dependencies.patch with command line arguments
   * Updated debian/watch and debian/orig-tar.sh to fetch the latest tagged
     build from the upsteam Mercurial repository.

Added: trunk/jtreg/debian/patches/add-jcommander-to-classpath.patch
===================================================================
--- trunk/jtreg/debian/patches/add-jcommander-to-classpath.patch	                        (rev 0)
+++ trunk/jtreg/debian/patches/add-jcommander-to-classpath.patch	2014-04-04 15:29:55 UTC (rev 17983)
@@ -0,0 +1,71 @@
+Description: Add jcommander to the classpath when TestNG is used.
+ This fixes a ClassNotFoundException when running the OpenJDK 8 tests
+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
+@@ -339,9 +339,10 @@
+         Path 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"));
++        }
+         if ((useCLASSPATH || script.isTestJDK11()) && !cp.isEmpty()) {
+             envArgs.add("CLASSPATH=" + cp);
+         }
+@@ -466,8 +467,10 @@
+         Path rcp = new Path(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(envVars, javaProg, javaProps, javaArgs, runMainClass, runMainArgs);
+@@ -517,8 +520,10 @@
+         Path classpath = new Path(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"));
++        }
+ 
+         List<String> envVars = Arrays.asList(script.getEnvVars());
+         String javaProg = script.getJavaProg();
+--- a/src/share/classes/com/sun/javatest/regtest/RegressionScript.java
++++ b/src/share/classes/com/sun/javatest/regtest/RegressionScript.java
+@@ -566,8 +566,10 @@
+             if (needJUnit)
+                 cacheCompileClassPath.append(params.getJUnitJar());
+ 
+-            if (needTestNG)
++            if (needTestNG) {
+                 cacheCompileClassPath.append(params.getTestNGJar());
++                cacheCompileClassPath.append(new File("/usr/share/java/jcommander.jar"));
++            }
+ 
+             // handle cpa option to jtreg
+             String[] envVars = getEnvVars();
+--- a/src/share/classes/com/sun/javatest/regtest/Main.java
++++ b/src/share/classes/com/sun/javatest/regtest/Main.java
+@@ -1516,8 +1516,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());
+ 

Modified: trunk/jtreg/debian/patches/series
===================================================================
--- trunk/jtreg/debian/patches/series	2014-04-04 13:47:56 UTC (rev 17982)
+++ trunk/jtreg/debian/patches/series	2014-04-04 15:29:55 UTC (rev 17983)
@@ -1 +1,2 @@
 launchers.patch
+add-jcommander-to-classpath.patch