This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jtreg.
commit ea5037049859a60159f71f87fc3cb486a47712fe Author: Emmanuel Bourg <[email protected]> Date: Sun Sep 4 23:35:07 2016 +0200 Refreshed the patches --- debian/changelog | 8 +++++ debian/patches/add-jcommander-to-classpath.patch | 40 ++++++++++++------------ debian/patches/launchers.patch | 6 ++-- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 03e60b2..68f98eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +jtreg (4.2-b03-1~exp1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Sun, 04 Sep 2016 23:04:56 +0200 + jtreg (4.2-b02-1~exp1) experimental; urgency=medium * Team upload. diff --git a/debian/patches/add-jcommander-to-classpath.patch b/debian/patches/add-jcommander-to-classpath.patch index 75f817d..6c2484c 100644 --- a/debian/patches/add-jcommander-to-classpath.patch +++ b/debian/patches/add-jcommander-to-classpath.patch @@ -4,59 +4,59 @@ 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 -@@ -540,6 +540,7 @@ +@@ -553,6 +553,7 @@ .append(jdk.getJDKClassPath()) - .append(script.getJUnitJar()) - .append(script.getTestNGJar()) -+ .append(new File("/usr/share/java/jcommander.jar")) - .split(); + .append(script.getJUnitPath()) + .append(script.getTestNGPath()) ++ .append(new SearchPath("/usr/share/java/jcommander.jar")) + .asList(); 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 -@@ -692,16 +692,20 @@ +@@ -700,16 +700,20 @@ File md = workDir.getFile("modules"); if (needJUnit) - install(params.getJUnitJar(), md); + install(params.getJUnitPath(), md); - if (needTestNG) + if (needTestNG) { - install(params.getTestNGJar(), md); -+ install(new File("/usr/share/java/jcommander.jar"), md); + install(params.getTestNGPath(), md); ++ install(new SearchPath("/usr/share/java/jcommander.jar"), md); + } mp.append(md); } } else { if (needJUnit) - cp.append(params.getJUnitJar()); + cp.append(params.getJUnitPath()); - if (needTestNG) + if (needTestNG) { - cp.append(params.getTestNGJar()); -+ cp.append(new File("/usr/share/java/jcommander.jar")); + cp.append(params.getTestNGPath()); ++ cp.append(new SearchPath("/usr/share/java/jcommander.jar")); + } } // Extras: -@@ -793,8 +797,10 @@ +@@ -801,8 +805,10 @@ File md = workDir.getFile("modules"); if (needJUnit) - install(params.getJUnitJar(), md); + install(params.getJUnitPath(), md); - if (needTestNG) + if (needTestNG) { - install(params.getTestNGJar(), md); -+ install(new File("/usr/share/java/jcommander.jar"), md); + install(params.getTestNGPath(), md); ++ install(new SearchPath("/usr/share/java/jcommander.jar"), md); + } mp.append(md); } } else { -@@ -802,8 +808,10 @@ +@@ -810,8 +816,10 @@ if (needJUnit) - fp.append(params.getJUnitJar()); + fp.append(params.getJUnitPath()); - if (needTestNG) + if (needTestNG) { - fp.append(params.getTestNGJar()); -+ fp.append(new File("/usr/share/java/jcommander.jar")); + fp.append(params.getTestNGPath()); ++ fp.append(new SearchPath("/usr/share/java/jcommander.jar")); + } } diff --git a/debian/patches/launchers.patch b/debian/patches/launchers.patch index f2a1e57..af66423 100644 --- a/debian/patches/launchers.patch +++ b/debian/patches/launchers.patch @@ -154,15 +154,15 @@ + JT_JAVA="/usr/lib/jvm/default-java" fi --# Verify java version (1.)5 or newer used to run jtreg +-# Verify java version (1.)7 or newer used to run jtreg -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 - echo "Cannot determine version of java to run jtreg" - exit 1; --elif [ "$version" -lt 5 ]; then -- echo "java version 5 or later is required to run jtreg" +-elif [ "$version" -lt 7 ]; then +- echo "java version 7 or later is required to run jtreg" - exit 1; +if [ -z "${JT_HOME}" ] || [ ! -f "${JT_HOME}/jtreg.jar" ]; then + JT_HOME="/usr/share/java" -- 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
