Vladimir Petko pushed to branch master at Debian Java Maintainers / jtreg7


Commits:
7a7ceb0b by Vladimir Petko at 2026-02-16T10:56:45+13:00
changelog: update changelog for release.

- - - - -
cf78469b by Vladimir Petko at 2026-02-16T21:50:46+13:00
d/p/codetools-7904152-proposed.patch: skip java policy tests with Java 25.

- - - - -
8dc88c3d by Vladimir Petko at 2026-02-16T21:50:56+13:00
changelog

- - - - -
ed381129 by Vladimir Petko at 2026-02-16T08:52:46+00:00
Merge branch 'java25-fix' into 'master'

jtreg7: resolve Java 25 build failure

See merge request java-team/jtreg7!12
- - - - -


3 changed files:

- debian/changelog
- + debian/patches/codetools-7904152.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,11 @@
-jtreg7 (7.5.2+1+ds2-1) UNRELEASED; urgency=medium
+jtreg7 (7.5.2+1+ds2-2) unstable; urgency=medium
+
+  * d/p/codetools-7904152.patch: skip security policy tests
+    with Java 25 (CODETOOLS-7904152).
+
+ -- Vladimir Petko <[email protected]>  Mon, 16 Feb 2026 10:53:39 
+1300
+
+jtreg7 (7.5.2+1+ds2-1) unstable; urgency=medium
 
   * d/{control, copyright,p/testng-build-with-gradle.patch}: drop
     snakeyaml dependency (Closes: #1117950).


=====================================
debian/patches/codetools-7904152.patch
=====================================
@@ -0,0 +1,73 @@
+Description: 7904152: jtreg tests fail with openjdk 25
+ The policy tests try to set the Security manager on the command-line
+ causing the Security Manager error.
+ The last supported JDK that allows setting the security manager is 21.
+Author: Vladimir Petko <[email protected]>
+Origin: upstream, 
https://github.com/openjdk/jtreg/commit/da8892fb26a51fc5d4c3d4e3be74384aa29f64ce
+Bug: https://bugs.openjdk.org/browse/CODETOOLS-7904152
+Last-Update: 2026-02-16
+
+--- a/doc/building.md
++++ b/doc/building.md
+@@ -118,7 +118,13 @@
+ ```
+
+ Some tests depend on specific versions of JDK being available, specified
+-by the following variables: `JDK8HOME`, `JDK9HOME`, `JDK14HOME`, `JDK18HOME`.
++by the following variables:
++- `JDK8HOME`
++- `JDK9HOME`
++- `JDK14HOME`
++- `JDK18HOME`
++- `JDK21HOME`
++- `JDK25HOME`
+ A test that requires any of these version of JDK will be skipped if the
+ variable is not set.
+
+--- a/make/Makefile
++++ b/make/Makefile
+@@ -60,6 +60,12 @@
+ ifndef JDK18HOME
+       @echo "Warning: JDK18HOME not set; some tests may not have been 
executed"
+ endif
++ifndef JDK21HOME
++      @echo "Warning: JDK21HOME not set; some tests may not have been 
executed"
++endif
++ifndef JDK25HOME
++      @echo "Warning: JDK25HOME not set; some tests may not have been 
executed"
++endif
+ ifdef HEADLESS
+       @echo "Warning: HEADLESS is set; some tests may not have been executed"
+ endif
+@@ -110,6 +116,12 @@
+ ifdef JDK18HOME
+       @echo "JDK18HOME           = $(JDK18HOME)"
+ endif
++ifdef JDK21HOME
++      @echo "JDK21HOME           = $(JDK21HOME)"
++endif
++ifdef JDK25HOME
++      @echo "JDK25HOME           = $(JDK25HOME)"
++endif
+       @echo "JDKHOME             = $(JDKHOME)"
+       @echo "JAVATEST_HOME       = $(JAVATEST_HOME)"
+ ifneq ($(JTHARNESS_HOME), $(JAVATEST_HOME))
+--- a/test/policy/PolicyTest.gmk
++++ b/test/policy/PolicyTest.gmk
+@@ -31,7 +31,7 @@
+       $(RM) $(@:%.ok=%) ; $(MKDIR) $(@:%.ok=%)
+       $(JTREG_IMAGEDIR)/bin/jtreg $(JTREG_OPTS) \
+               -w:$(@:%.ok=%)/work -r:$(@:%.ok=%)/report \
+-              -jdk:$(JDKHOME) \
++              -jdk:$(JDK21HOME) \
+               -agentvm \
+               -retain:all \
+               $(TESTDIR)/policy/  \
+@@ -44,5 +44,6 @@
+       $(GREP) 'grant.*testng[^ ]*.jar' 
$(@:%.ok=%)/work/TestNG/simple.policy_new
+       echo "test passed at `date`" > $@
+
++ifdef JDK21HOME
+ TESTS.jtreg += $(BUILDTESTDIR)/PolicyTest.ok
+-
++endif


=====================================
debian/patches/series
=====================================
@@ -32,3 +32,4 @@ codetools-7904104-proposed.patch
 codetools-7904105-proposed.patch
 codetools-7904106-proposed.patch
 codetools-7904107-proposed.patch
+codetools-7904152.patch



View it on GitLab: 
https://salsa.debian.org/java-team/jtreg7/-/compare/6b08fc4da6979825197d4f22dbc5bdb406d4f740...ed3811291e7747a7a32104d2b35540394ab9bf48

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/jtreg7/-/compare/6b08fc4da6979825197d4f22dbc5bdb406d4f740...ed3811291e7747a7a32104d2b35540394ab9bf48
You're receiving this email because of your account on salsa.debian.org.


_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to