openkylin
/
jtreg6
mirror of https://gitee.com/openkylin/jtreg6.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
luoyaoming 2024-05-07 16:06:15 +08:00
parent 79c994013b
commit ee408067b6
7 changed files with 159 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
debian/patches/add-jcommander-to-classpath.patch vendored
View File

@ -1,10 +1,20 @@
Description: Add jcommander to the classpath when TestNG is used.
This fixes a ClassNotFoundException when running the OpenJDK 8 tests
Author: Emmanuel Bourg <ebourg@apache.org>
From: Emmanuel Bourg <ebourg@apache.org>
Date: Tue, 7 May 2024 16:06:15 +0800
Subject: Add jcommander to the classpath when TestNG is used.
Forwarded: no
This fixes a ClassNotFoundException when running the OpenJDK 8 tests
---
.../com/sun/javatest/regtest/exec/MainAction.java | 1 +
.../com/sun/javatest/regtest/exec/RegressionScript.java | 16 ++++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java b/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java
index d3b41e4..2140698 100644
--- a/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java
+++ b/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java
@@ -575,6 +575,7 @@
@@ -575,6 +575,7 @@ public class MainAction extends Action
.append(jdk.getJDKClassPath())
.append(script.getJUnitPath())
.append(script.getTestNGPath())
@ -12,9 +22,11 @@ Forwarded: no
.asList();
Version v = script.getRequiredVersion();
diff --git a/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java b/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
index 61a9a3e..3ddef5c 100644
--- a/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
+++ b/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
@@ -829,16 +829,20 @@
@@ -829,16 +829,20 @@ public class RegressionScript extends Script {
File md = workDir.getFile("modules");
if (needJUnit)
install(params.getJUnitPath(), md);
@ -37,7 +49,7 @@ Forwarded: no
}
// Extras:
@@ -930,8 +934,10 @@
@@ -930,8 +934,10 @@ public class RegressionScript extends Script {
File md = workDir.getFile("modules");
if (needJUnit)
install(params.getJUnitPath(), md);
@ -49,7 +61,7 @@ Forwarded: no
mp.append(md);
}
} else {
@@ -939,8 +945,10 @@
@@ -939,8 +945,10 @@ public class RegressionScript extends Script {
if (needJUnit)
fp.append(params.getJUnitPath());

36
debian/patches/add-logger-to-classpath.patch vendored
View File

@ -1,23 +1,35 @@
Description: Add slf4j to the classpath in line with jcommander patch
Some jtreg tests are failing due to the missing slf4j (dependency of testng7).
Add slf4j to the classpath in line with the jcommander patch.
Author: Vladimir Petko <vladimir.petko@canonical.com>
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Tue, 7 May 2024 16:06:15 +0800
Subject: Add slf4j to the classpath in line with jcommander patch
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/jtreg6/+bug/2012320
Last-Update: 2023-03-31
Some jtreg tests are failing due to the missing slf4j (dependency of testng7).
Add slf4j to the classpath in line with the jcommander patch.
---
src/share/classes/com/sun/javatest/regtest/exec/MainAction.java | 2 ++
.../classes/com/sun/javatest/regtest/exec/RegressionScript.java | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java b/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java
index 2140698..6ffe686 100644
--- a/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java
+++ b/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java
@@ -576,6 +576,8 @@
@@ -576,6 +576,8 @@ public class MainAction extends Action
.append(script.getJUnitPath())
.append(script.getTestNGPath())
.append(new SearchPath("/usr/share/java/jcommander.jar"))
+ .append(new SearchPath("/usr/share/java/slf4j-simple.jar"))
+ .append(new SearchPath("/usr/share/java/slf4j-api.jar"))
.asList();
Version v = script.getRequiredVersion();
diff --git a/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java b/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
index 3ddef5c..fa3181b 100644
--- a/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
+++ b/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
@@ -820,6 +820,8 @@
@@ -832,6 +832,8 @@ public class RegressionScript extends Script {
if (needTestNG) {
install(params.getTestNGPath(), md);
install(new SearchPath("/usr/share/java/jcommander.jar"), md);
@ -26,7 +38,7 @@ Last-Update: 2023-03-31
}
mp.append(md);
}
@@ -830,6 +832,8 @@
@@ -842,6 +844,8 @@ public class RegressionScript extends Script {
if (needTestNG) {
cp.append(params.getTestNGPath());
cp.append(new SearchPath("/usr/share/java/jcommander.jar"));
@ -34,8 +46,8 @@ Last-Update: 2023-03-31
+ cp.append(new SearchPath("/usr/share/java/slf4j-api.jar"));
}
}
@@ -925,6 +929,8 @@
@@ -937,6 +941,8 @@ public class RegressionScript extends Script {
if (needTestNG) {
install(params.getTestNGPath(), md);
install(new SearchPath("/usr/share/java/jcommander.jar"), md);
@ -44,7 +56,7 @@ Last-Update: 2023-03-31
}
mp.append(md);
}
@@ -936,6 +942,8 @@
@@ -948,6 +954,8 @@ public class RegressionScript extends Script {
if (needTestNG) {
fp.append(params.getTestNGPath());
fp.append(new SearchPath("/usr/share/java/jcommander.jar"));
@ -52,4 +64,4 @@ Last-Update: 2023-03-31
+ fp.append(new SearchPath("/usr/share/java/slf4j-api.jar"));
}
}

25
debian/patches/add-release-options.patch vendored
View File

@ -1,14 +1,23 @@
Description: Set release option to be able to compile with default-jdk
jtreg6 does not set release option and produces class files corresponding
to the compiling jdk. This is expected behavior and patch is not
needed upstream.
We require this patch only to avoid dependency on openjdk-8.
Author: Vladimir Petko <vladimir.petko@canonical.com>
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Tue, 7 May 2024 16:06:15 +0800
Subject: Set release option to be able to compile with default-jdk
Forwarded: not-needed
Last-Update: 2023-08-11
jtreg6 does not set release option and produces class files corresponding
to the compiling jdk. This is expected behavior and patch is not
needed upstream.
We require this patch only to avoid dependency on openjdk-8.
---
make/Defs.gmk | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/make/Defs.gmk b/make/Defs.gmk
index e8b74d4..7902739 100644
--- a/make/Defs.gmk
+++ b/make/Defs.gmk
@@ -149,7 +149,7 @@
@@ -143,7 +143,7 @@ JAR = $(JDKHOME)/bin/jar
# Only use -source -target, to support legacy platforms, when building with JDK 8
# Otherwise, use default values for $JDKHOME/bin/javac
@ -17,7 +26,7 @@ Last-Update: 2023-08-11
ifneq ($(SUPPORT_OLD_SOURCE_TARGET),)
OLD_JAVAC_SOURCE_TARGET = -source 1.2 -target 1.1
AGENT_JAVAC_SOURCE_TARGET = -source 5 -target 5
@@ -157,7 +157,10 @@
@@ -151,7 +151,10 @@ ifneq ($(SUPPORT_OLD_SOURCE_TARGET),)
REGTEST_TOOL_PATCH_JAVA_BASE_OPTIONS =
else
EXTRA_LINT_OPTS = -rawtypes,-unchecked

23
debian/patches/java21-suppress-serial.patch vendored
View File

@ -1,24 +1,31 @@
Description: cannot compile jtreg with jdk-19
Java 19 introduced a [serial] linter warning. The build fails due to
'[serial] non-transient instance field of a serializable class declared with
a non-serializable type'.
Author: Jonathan Gibbons <jjg@openjdk.org>
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Tue, 7 May 2024 16:06:15 +0800
Subject: cannot compile jtreg with jdk-19
Origin: upstream, https://github.com/openjdk/jtreg/commit/f4f1a41e4add3187b2c73f95c06591ae2de475a4
Bug: https://bugs.openjdk.org/browse/CODETOOLS-7903346
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057511
Forwarded: not-needed
Applied-Upstream: f4f1a41e4add3187b2c73f95c06591ae2de475a4
Java 19 introduced a [serial] linter warning. The build fails due to
'[serial] non-transient instance field of a serializable class declared with
a non-serializable type'.
---
src/share/classes/com/sun/javatest/diff/SuperDiff.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/share/classes/com/sun/javatest/diff/SuperDiff.java b/src/share/classes/com/sun/javatest/diff/SuperDiff.java
index b40fe38..8c8d92b 100644
index a65d2f7..62fbfe1 100644
--- a/src/share/classes/com/sun/javatest/diff/SuperDiff.java
+++ b/src/share/classes/com/sun/javatest/diff/SuperDiff.java
@@ -212,10 +212,9 @@ class SuperDiff extends Diff {
}
}
+ @SuppressWarnings("serial")
static class SuperTable extends TreeMap<YearDay, Map<String, File>> {
- static final long serialVersionUID = 5933594140534747584L;
-
SuperTable(File inDir, String resultPath) {

78
debian/patches/java21-this-escape.patch vendored
View File

@ -1,26 +1,44 @@
Description: fix [this-escape] warnings by declaring classes final.
[this-escape] warning is generated when a class's constructor calls
a method that can be overridden.
Author: Jonathan Gibbons <jjg@openjdk.org>
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Tue, 7 May 2024 16:06:15 +0800
Subject: fix [this-escape] warnings by declaring classes final.
Origin: upstream, https://github.com/openjdk/jtreg/commit/48935be4685ec5c99b3fe15c10439946944c9f7e
Bug: https://bugs.openjdk.org/browse/CODETOOLS-7903516
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057511
Forwarded: not-needed
Applied-Upstream: 48935be4685ec5c99b3fe15c10439946944c9f7e
[this-escape] warning is generated when a class's constructor calls
a method that can be overridden.
---
src/share/classes/com/sun/javatest/regtest/agent/AgentServer.java | 2 +-
src/share/classes/com/sun/javatest/regtest/agent/SearchPath.java | 2 +-
src/share/classes/com/sun/javatest/regtest/config/Locations.java | 2 +-
src/share/classes/com/sun/javatest/regtest/config/ParseException.java | 4 ++--
.../classes/com/sun/javatest/regtest/config/RegressionParameters.java | 2 +-
.../classes/com/sun/javatest/regtest/config/RegressionTestFinder.java | 2 +-
.../classes/com/sun/javatest/regtest/config/RegressionTestSuite.java | 2 +-
src/share/classes/com/sun/javatest/regtest/util/StreamCopier.java | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/share/classes/com/sun/javatest/regtest/agent/AgentServer.java b/src/share/classes/com/sun/javatest/regtest/agent/AgentServer.java
index 06e9cae..1adc18e 100644
--- a/src/share/classes/com/sun/javatest/regtest/agent/AgentServer.java
+++ b/src/share/classes/com/sun/javatest/regtest/agent/AgentServer.java
@@ -57,7 +57,7 @@
@@ -57,7 +57,7 @@ import java.util.concurrent.TimeUnit;
@SuppressWarnings("removal") // Security Manager and related APIs
-public class AgentServer implements ActionHelper.OutputHandler {
+public final class AgentServer implements ActionHelper.OutputHandler {
/**
* Main program used to invoke and run the server in child JVMs
diff --git a/src/share/classes/com/sun/javatest/regtest/agent/SearchPath.java b/src/share/classes/com/sun/javatest/regtest/agent/SearchPath.java
index de4c839..1ec16bf 100644
--- a/src/share/classes/com/sun/javatest/regtest/agent/SearchPath.java
+++ b/src/share/classes/com/sun/javatest/regtest/agent/SearchPath.java
@@ -37,7 +37,7 @@
@@ -37,7 +37,7 @@ import java.util.regex.Pattern;
* A path, as in an ordered set of file system locations, such as directories,
* zip files and jar files.
*/
@ -29,9 +47,11 @@ Applied-Upstream: 48935be4685ec5c99b3fe15c10439946944c9f7e
/**
* Create an empty path.
*/
diff --git a/src/share/classes/com/sun/javatest/regtest/config/Locations.java b/src/share/classes/com/sun/javatest/regtest/config/Locations.java
index 4560ad2..47eb29a 100644
--- a/src/share/classes/com/sun/javatest/regtest/config/Locations.java
+++ b/src/share/classes/com/sun/javatest/regtest/config/Locations.java
@@ -44,7 +44,7 @@
@@ -44,7 +44,7 @@ import com.sun.javatest.regtest.util.StringUtils;
/**
* Utilities to locate source and class files used by a test.
*/
@ -40,9 +60,11 @@ Applied-Upstream: 48935be4685ec5c99b3fe15c10439946944c9f7e
/**
* Used to report problems that are found.
*/
diff --git a/src/share/classes/com/sun/javatest/regtest/config/ParseException.java b/src/share/classes/com/sun/javatest/regtest/config/ParseException.java
index 50fa7f5..d86b097 100644
--- a/src/share/classes/com/sun/javatest/regtest/config/ParseException.java
+++ b/src/share/classes/com/sun/javatest/regtest/config/ParseException.java
@@ -34,7 +34,7 @@
@@ -34,7 +34,7 @@ import com.sun.javatest.regtest.exec.TestRunException;
*
* @author Iris A Garcia
*/
@ -51,29 +73,33 @@ Applied-Upstream: 48935be4685ec5c99b3fe15c10439946944c9f7e
{
static final long serialVersionUID = 5598548899306920122L;
public ParseException(String msg) {
@@ -44,7 +44,7 @@
@@ -44,7 +44,7 @@ public class ParseException extends TestRunException
public ParseException(Throwable t) {
super(PARSE_EXCEPTION + t.getMessage());
initCause(t);
- } // ParseExeptionException()
+ }
//----------misc statics----------------------------------------------------
diff --git a/src/share/classes/com/sun/javatest/regtest/config/RegressionParameters.java b/src/share/classes/com/sun/javatest/regtest/config/RegressionParameters.java
index cd0f716..3cbe0e6 100644
--- a/src/share/classes/com/sun/javatest/regtest/config/RegressionParameters.java
+++ b/src/share/classes/com/sun/javatest/regtest/config/RegressionParameters.java
@@ -65,7 +65,7 @@
@@ -65,7 +65,7 @@ import com.sun.javatest.regtest.util.StringUtils;
import static com.sun.javatest.regtest.util.StringUtils.join;
-public class RegressionParameters
+public final class RegressionParameters
extends BasicInterviewParameters
implements Parameters.EnvParameters
{
diff --git a/src/share/classes/com/sun/javatest/regtest/config/RegressionTestFinder.java b/src/share/classes/com/sun/javatest/regtest/config/RegressionTestFinder.java
index 2778382..6a5bc1a 100644
--- a/src/share/classes/com/sun/javatest/regtest/config/RegressionTestFinder.java
+++ b/src/share/classes/com/sun/javatest/regtest/config/RegressionTestFinder.java
@@ -66,7 +66,7 @@
@@ -66,7 +66,7 @@ import com.sun.javatest.util.I18NResourceBundle;
* @see com.sun.javatest.TestFinder
* @see com.sun.javatest.finder.TagTestFinder
*/
@ -82,25 +108,29 @@ Applied-Upstream: 48935be4685ec5c99b3fe15c10439946944c9f7e
{
/**
* Constructs the list of file names to exclude for pruning in the search
diff --git a/src/share/classes/com/sun/javatest/regtest/config/RegressionTestSuite.java b/src/share/classes/com/sun/javatest/regtest/config/RegressionTestSuite.java
index 6ff1636..dd8c7ce 100644
--- a/src/share/classes/com/sun/javatest/regtest/config/RegressionTestSuite.java
+++ b/src/share/classes/com/sun/javatest/regtest/config/RegressionTestSuite.java
@@ -51,7 +51,7 @@
@@ -51,7 +51,7 @@ import com.sun.javatest.util.I18NResourceBundle;
import com.sun.javatest.regtest.tool.RegressionContextManager;
-public class RegressionTestSuite extends TestSuite
+public final class RegressionTestSuite extends TestSuite
{
static Map<File, SoftReference<RegressionTestSuite>> cache;
diff --git a/src/share/classes/com/sun/javatest/regtest/util/StreamCopier.java b/src/share/classes/com/sun/javatest/regtest/util/StreamCopier.java
index 2706f76..2e04d72 100644
--- a/src/share/classes/com/sun/javatest/regtest/util/StreamCopier.java
+++ b/src/share/classes/com/sun/javatest/regtest/util/StreamCopier.java
@@ -34,7 +34,7 @@
@@ -34,7 +34,7 @@ import java.io.PrintWriter;
/**
* A thread to copy an input stream/reader to an output stream/writer.
*/
-public class StreamCopier extends Thread {
+public final class StreamCopier extends Thread {
public StreamCopier(InputStream in, PrintWriter out, LineScanner scanner) {
super(Thread.currentThread().getName() + "_StreamCopier_" + (serial++));

22
debian/patches/launchers.patch vendored
View File

@ -1,6 +1,16 @@
Description: Modifies the launcher scripts to specify the default Java and jtreg paths
Author: Emmanuel Bourg <ebourg@apache.org>
From: Emmanuel Bourg <ebourg@apache.org>
Date: Tue, 7 May 2024 16:06:15 +0800
Subject: Modifies the launcher scripts to specify the default Java and jtreg
paths
Forwarded: not-needed
---
src/share/bin/jtdiff.sh | 6 +++++-
src/share/bin/jtreg.sh | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/share/bin/jtdiff.sh b/src/share/bin/jtdiff.sh
index f8fb8ab..05edfa5 100644
--- a/src/share/bin/jtdiff.sh
+++ b/src/share/bin/jtdiff.sh
@@ -37,6 +37,10 @@
@ -14,7 +24,7 @@ Forwarded: not-needed
# Determine jtdiff/JavaTest installation directory
if [ -n "$JT_HOME" ]; then
if [ ! -r $JT_HOME/lib/jtreg.jar ];then
@@ -96,7 +100,7 @@
@@ -96,7 +100,7 @@ if [ -n "$JT_JAVA" ]; then
elif [ -n "$JAVA_HOME" ]; then
JT_JAVA="$JAVA_HOME/bin/java"
else
@ -23,9 +33,11 @@ Forwarded: not-needed
fi
# Verify java version (1.)5 or newer used to run jtdiff
diff --git a/src/share/bin/jtreg.sh b/src/share/bin/jtreg.sh
index cb6e46d..a89742c 100644
--- a/src/share/bin/jtreg.sh
+++ b/src/share/bin/jtreg.sh
@@ -70,6 +70,10 @@
@@ -70,6 +70,10 @@ esac
# Determine jtreg installation directory
JTREG_HOME=${JTREG_HOME:-$JT_HOME} # allow for old version of name
@ -36,7 +48,7 @@ Forwarded: not-needed
if [ -n "$JTREG_HOME" ]; then
if [ ! -r $JTREG_HOME/lib/jtreg.jar ];then
echo "Invalid JTREG_HOME=$JTREG_HOME. Cannot find or read $JTREG_HOME/lib/jtreg.jar"
@@ -125,7 +129,7 @@
@@ -125,7 +129,7 @@ elif [ -n "$JAVA_HOME" ]; then
elif [ -n "$jdk" ]; then
JTREG_JAVA="$jdk/bin/java"
else

19
debian/patches/reproducible-build.patch vendored
View File

@ -1,10 +1,17 @@
Description: Make the build reproducible
Author: Chris Lamb <lamby@debian.org>
Last-Update: 2023-08-31
From: Chris Lamb <lamby@debian.org>
Date: Tue, 7 May 2024 16:06:15 +0800
Subject: Make the build reproducible
--- jtreg6-6.2+1.orig/make/Rules.gmk
+++ jtreg6-6.2+1/make/Rules.gmk
@@ -55,6 +55,13 @@ $(CLASSDIR) $(BUILDDIR) $(BUILDDIR)/test
Last-Update: 2023-08-31
---
make/Rules.gmk | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/make/Rules.gmk b/make/Rules.gmk
index 32f8beb..2e7e9e8 100644
--- a/make/Rules.gmk
+++ b/make/Rules.gmk
@@ -55,6 +55,13 @@ $(CLASSDIR) $(BUILDDIR) $(BUILDDIR)/testClasses $(BUILDDIR)/testWork $(BUILDDIR)
# default copyright; override as necessary
JAR_COPYRIGHT = -C $(TOPDIR) COPYRIGHT