This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jtreg.
commit 28b361e08e9cb0811d0d5a80d5df3ce05d714161 Author: Emmanuel Bourg <[email protected]> Date: Thu Jun 18 18:02:17 2015 +0200 Refreshed the patches --- debian/changelog | 4 +++- debian/patches/add-jcommander-to-classpath.patch | 29 ++++++++++++------------ debian/patches/launchers.patch | 4 ++-- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index b27aaa4..0cc34a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -jtreg (4.1-b09-2) UNRELEASED; urgency=medium +jtreg (4.1-b12-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches * Fixed debian/watch -- Emmanuel Bourg <[email protected]> Thu, 18 Jun 2015 17:48:42 +0200 diff --git a/debian/patches/add-jcommander-to-classpath.patch b/debian/patches/add-jcommander-to-classpath.patch index de87a0b..f48787d 100644 --- a/debian/patches/add-jcommander-to-classpath.patch +++ b/debian/patches/add-jcommander-to-classpath.patch @@ -4,21 +4,20 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/src/share/classes/com/sun/javatest/regtest/MainAction.java +++ b/src/share/classes/com/sun/javatest/regtest/MainAction.java -@@ -343,9 +343,10 @@ - Path p = bcp.isEmpty() ? cp : bcp; +@@ -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")); + } - if ((useCLASSPATH || script.isTestJDK11()) && !cp.isEmpty()) { - envArgs.add("CLASSPATH=" + cp); - } -@@ -470,8 +471,10 @@ - Path rcp = new Path(script.getJavaTestClassPath(), script.getTestJDK().getJDKClassPath()); + + 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()) @@ -28,9 +27,9 @@ Forwarded: no + } rcp.append(runClasspath); List<String> javaArgs = Arrays.asList("-classpath", rcp.toString()); - recorder.java(envVars, javaProg, javaProps, javaArgs, runMainClass, runMainArgs); -@@ -521,8 +524,10 @@ - Path classpath = new Path(script.getJavaTestClassPath(), jdk.getJDKClassPath()); + 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()) @@ -39,11 +38,11 @@ Forwarded: no + classpath.append(new File("/usr/share/java/jcommander.jar")); + } - List<String> envVars = Arrays.asList(script.getEnvVars()); String javaProg = script.getJavaProg(); + SearchPath rcp = new SearchPath(classpath, runClasspath); --- a/src/share/classes/com/sun/javatest/regtest/RegressionScript.java +++ b/src/share/classes/com/sun/javatest/regtest/RegressionScript.java -@@ -567,8 +567,10 @@ +@@ -574,8 +574,10 @@ if (needJUnit) cacheCompileClassPath.append(params.getJUnitJar()); @@ -54,10 +53,10 @@ Forwarded: no + } // handle cpa option to jtreg - String[] envVars = getEnvVars(); + 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 -@@ -1516,8 +1516,10 @@ +@@ -1628,8 +1628,10 @@ classpath.add(childTools); if (junit_jar.exists()) classpath.add(junit_jar); diff --git a/debian/patches/launchers.patch b/debian/patches/launchers.patch index 282acd3..f2a1e57 100644 --- a/debian/patches/launchers.patch +++ b/debian/patches/launchers.patch @@ -63,7 +63,7 @@ fi -# Verify java version (1.)5 or newer used to run jtdiff --version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.GetSystemProperty java.version 2>&1 | +-version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.agent.GetSystemProperty java.version 2>&1 | - grep 'java.version=' | sed -e 's/^.*=//' -e 's/^1\.//' -e 's/\([1-9][0-9]*\).*/\1/'` - -if [ -z "$version" ]; then @@ -155,7 +155,7 @@ fi -# Verify java version (1.)5 or newer used to run jtreg --version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.GetSystemProperty java.version 2>&1 | +-version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.agent.GetSystemProperty java.version 2>&1 | - grep 'java.version=' | sed -e 's/^.*=//' -e 's/^1\.//' -e 's/\([1-9][0-9]*\).*/\1/'` - -if [ -z "$version" ]; then -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jtreg.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
