Merge ~vpa1977/ubuntu/+source/openjdk-17:02_jdk17_specific into ubuntu/+source/openjdk-17:ubuntu/devel

[Vladimir Petko]

This merge request is a final part of the series [1][2]

Summary of changes:
  * d/t/{jtreg-autopkgtest.in, jtreg-autopkgtest.sh}: pass JTREG home to locate junit.jar.
  * drop d/p/{jaw-classpath.diff, jaw-optional.diff}: the atk wrapper is disabled and these patches cause class data sharing tests to fail.
  * d/p/exclude-broken-tests.patch: add OpenJDK 17 failures.

PPA: ppa:vpa1977/openjdk-tiers2 [4]

Testing:
 - JTREG tests should pass (depends on integration of [2]), see comment

[1] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-17/+git/openjdk-17/+merge/440208
[2] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-17/+git/openjdk-17/+merge/440209
[3] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-20/+git/openjdk-20/+merge/440204
[4] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-tiers2

[Vladimir Petko (vpa1977)]

amd64 --> /~vpa1977/+archive/ubuntu/openjdk-tiers2/+build/25980172
----------------cut----------------------------------------------
Platform: amd64
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 2,503
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-17-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for langtools ---------------
Test results: passed: 4,238
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-17-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for jaxp ---------------
Test results: passed: 454
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-17-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for jdk ---------------
(xfwm4:1672759): dbind-WARNING **: 05:29:27.971: AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files
(xfwm4:1672759): xfwm4-WARNING **: 05:29:28.475: Another compositing manager is running on screen 0
(xfwm4:1672759): xfwm4-WARNING **: 05:29:28.477: Failed to connect to session manager: Failed to connect to the session manager: SESSION_MANAGER environment variable not defined
Test results: passed: 5,857
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-17-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
Killed
make[2]: Leaving directory '/<<PKGBUILDDIR>>'
 Command being timed: "/usr/bin/make -f debian/rules -k jtregcheck TEST_SUITES=hotspot langtools jaxp jdk JTREG_OPTIONS="
 User time (seconds): 29168.95
 System time (seconds): 1819.27
 Percent of CPU this job got: 331%
 Elapsed (wall clock) time (h:mm:ss or m:ss): 2:35:58
 Average shared text size (kbytes): 0
 Average unshared data size (kbytes): 0
 Average stack size (kbytes): 0
 Average total size (kbytes): 0
 Maximum resident set size (kbytes): 7406384
 Average resident set size (kbytes): 0
 Major (requiring I/O) page faults: 598
 Minor (reclaiming a frame) page faults: 407397440
 Voluntary context switches: 77216292
 Involuntary context switches: 46706555
 Swaps: 0
 File system inputs: 2016200
 File system outputs: 174756632
 Socket messages sent: 0
 Socket messages received: 0
 Signals delivered: 0
 Page size (bytes): 4096
 Exit status: 0
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 2,503
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-17-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summa...

[Graham Inggs (ginggs)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index d674951..af2894b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openjdk-17 (17.0.6+10-1ubuntu3) UNRELEASED; urgency=medium
+openjdk-17 (17.0.6+10-1ubuntu3) lunar; urgency=medium
 
   * d/control: add jtreg6 dependencies, regenerate control.
   * d/t/{jdk,hotspot,jaxp,lantools}: run tier1 and tier2 jtreg tests only,
@@ -18,6 +18,11 @@ openjdk-17 (17.0.6+10-1ubuntu3) UNRELEASED; urgency=medium
       patches to workaround missing DNS resolver on the build machines.
     - exclude_broken_tests.patch: quarantine failing tests.
   * d/rules: package external debug symbols (LP: #2015835).
+  * drop d/p/{jaw-classpath.diff, jaw-optional.diff}: the atk wrapper is disabled
+    and these patches cause class data sharing tests to fail (LP: #2016194).
+  * d/p/exclude-broken-tests.patch: add OpenJDK 17 failures.
+  * d/t/jtreg-autopkgtest.in: pass JTREG home to locate junit.jar, regenerate
+    d/t/jtreg-autopkgtest.sh (LP: #2016206).
 
  -- Vladimir Petko <[e-mail]>  Mon, 27 Mar 2023 11:41:46 +1300
 
diff --git a/debian/patches/exclude-broken-tests.patch b/debian/patches/exclude-broken-tests.patch
index 2b846bc..0eb04d5 100644
--- a/debian/patches/exclude-broken-tests.patch
+++ b/debian/patches/exclude-broken-tests.patch
@@ -5,14 +5,10 @@ Forwarded: not-needed
 Last-Update: 2023-03-24
 --- a/test/hotspot/jtreg/ProblemList.txt
 +++ b/test/hotspot/jtreg/ProblemList.txt
-@@ -38,6 +38,20 @@
+@@ -38,6 +38,22 @@
  #
  #############################################################################
  
-+# tests broken by Debian-specific patches
-+
-+runtime/BootClassAppendProp/GetBootClassPathAppendProp.java 0000000 generic-all
-+
 +# tests that need to be investigated
 +
 +gc/shenandoah/mxbeans/TestChurnNotifications.java#aggressive 0000000 generic-all
@@ -23,6 +19,12 @@ Last-Update: 2023-03-24
 +
 +runtime/LoadClass/LongBCP.java 8166162 generic-all
 +
++# Intermittent failures because LingeredApp.class is not found
++
++runtime/cds/appcds/jcmd/JCmdTestDynamicDump.java 000000 generic-all
++runtime/cds/appcds/jcmd/JCmdTestFileSafety.java  000000 generic-all
++runtime/cds/appcds/jcmd/JCmdTestStaticDump.java  000000 generic-all
++
  # :hotspot_compiler
  
  compiler/ciReplay/TestSAServer.java 8029528 generic-all
@@ -42,7 +44,7 @@ Last-Update: 2023-03-24
  # javadoc
 --- a/test/jdk/ProblemList.txt
 +++ b/test/jdk/ProblemList.txt
-@@ -109,6 +109,44 @@
+@@ -109,6 +109,49 @@
  #
  #############################################################################
  
@@ -84,10 +86,15 @@ Last-Update: 2023-03-24
 +
 +java/lang/invoke/lambda/LambdaFileEncodingSerialization.java 8249079 generic-all
 +
++# reproducible-properties-timestamp.diff introduce a bug that breaks this test
++# remove after the patch is dropped
++
++java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigWithInputStreamTest.java 000000 generic-all
++
  ############################################################################
  
  # jdk_awt
-@@ -539,7 +577,6 @@
+@@ -539,7 +582,6 @@
  java/lang/ProcessHandle/InfoTest.java                           8211847 aix-ppc64
  java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java        8151492 generic-all
  java/lang/invoke/LFCaching/LFGarbageCollectedTest.java          8078602 generic-all
diff --git a/debian/patches/jaw-classpath.diff b/debian/patches/jaw-classpath.diff
deleted file mode 100644
index 5cf865e..0000000
--- a/debian/patches/jaw-classpath.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix finding the Java ATK wrapper, see #900912
-
---- a/src/hotspot/os/linux/os_linux.cpp
-+++ b/src/hotspot/os/linux/os_linux.cpp
-@@ -464,6 +464,7 @@
-     if (!set_boot_path('/', ':')) {
-       vm_exit_during_initialization("Failed setting boot class path.", NULL);
-     }
-+    Arguments::append_sysclasspath("/usr/share/java/java-atk-wrapper.jar");
-   }
- 
-   // Where to look for native libraries.
diff --git a/debian/patches/jaw-optional.diff b/debian/patches/jaw-optional.diff
deleted file mode 100644
index 4eb0636..0000000
--- a/debian/patches/jaw-optional.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Make failing to load the Java ATK wrapper non-fatal
-
----
- src/java.desktop/share/classes/java/awt/Toolkit.java |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/src/java.desktop/share/classes/java/awt/Toolkit.java
-+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java
-@@ -602,7 +602,11 @@ public abstract class Toolkit {
-                 toolkit = new HeadlessToolkit(toolkit);
-             }
-             if (!GraphicsEnvironment.isHeadless()) {
-+              try {
-                 loadAssistiveTechnologies();
-+              } catch (java.awt.AWTError e) {
-+                // too bad
-+              }
-             }
-         }
-         return toolkit;
diff --git a/debian/patches/series b/debian/patches/series
index d435ec4..1a26e90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,8 +22,6 @@ reproducible-properties-timestamp.diff
 make-debug-print.diff
 Don-t-optimize-fdlibm-fork-for-Zero-on-linux-sparc-Z.patch
 keep-gtk2-as-default.patch
-jaw-classpath.diff
-jaw-optional.diff
 reproducible-character-data.diff
 reproducible-module-info.diff
 #reproducible-copyright-headers.diff
diff --git a/debian/patches/update-permission-test.patch b/debian/patches/update-permission-test.patch
index 59a28ab..d1437d5 100644
--- a/debian/patches/update-permission-test.patch
+++ b/debian/patches/update-permission-test.patch
@@ -23,3 +23,29 @@ Last-Update: 2023-03-24
          permissions.add(new ReflectPermission("suppressAccessChecks"));
          permissions.add(new FilePermission("<<ALL FILES>>",
                  "read, write, delete"));
+--- a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPPolicyManager.java
++++ b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPPolicyManager.java
+@@ -35,6 +35,7 @@
+ import java.util.HashMap;
+ import java.util.Map;
+ import java.util.PropertyPermission;
++import java.lang.reflect.ReflectPermission;
+ import java.util.Set;
+ import java.util.StringJoiner;
+ 
+@@ -110,6 +111,15 @@
+         addPermission(new SecurityPermission("setPolicy"));
+         addPermission(new RuntimePermission("setSecurityManager"));
+         addPermission(new PropertyPermission("test.src", "read"));
++        addPermission(new PropertyPermission("testng.show.stack.frames", "read"));
++        addPermission(new PropertyPermission("testng.thread.affinity", "read"));
++        addPermission(new PropertyPermission("testng.memory.friendly", "read"));
++        addPermission(new PropertyPermission("testng.mode.dryrun", "read"));
++        addPermission(new PropertyPermission("testng.report.xml.name", "read"));
++        addPermission(new PropertyPermission("testng.timezone", "read"));
++        addPermission(new PropertyPermission("testng.default.verbose", "read"));
++        addPermission(new PropertyPermission("testng.ignore.callback.skip", "read"));
++        addPermission(new ReflectPermission("suppressAccessChecks"));
+     }
+ 
+     /*
diff --git a/debian/tests/jtreg-autopkgtest.in b/debian/tests/jtreg-autopkgtest.in
index 24ed777..4b62d12 100755
--- a/debian/tests/jtreg-autopkgtest.in
+++ b/debian/tests/jtreg-autopkgtest.in
@@ -92,6 +92,7 @@ for i in 0 1; do
   report_path="${i}/JTreport"
   report_dir="${output_dir}/${report_path}"
   jtreg ${jt_options} \
+    -vmoption:-Djtreg.home=/usr/share/jtreg \
     -verbose:summary \
     -automatic \
     -retain:none \
diff --git a/debian/tests/jtreg-autopkgtest.sh b/debian/tests/jtreg-autopkgtest.sh
index b828b79..8853da4 100755
--- a/debian/tests/jtreg-autopkgtest.sh
+++ b/debian/tests/jtreg-autopkgtest.sh
@@ -98,6 +98,7 @@ for i in 0 1; do
   report_dir="${output_dir}/${report_path}"
 # see make/RunTests.gmk for a set of good options
   jtreg ${jt_options} \
+    -J-Djtreg.home=/usr/share/jtreg \
     -verbose:summary \
     -automatic \
     -retain:none \
diff --git a/debian/tests/problems-i386.txt b/debian/tests/problems-i386.txt
index 1028756..01f2c91 100644
--- a/debian/tests/problems-i386.txt
+++ b/debian/tests/problems-i386.txt
@@ -10,4 +10,7 @@ gtest/GTestWrapper.java 000000 generic-all
 
 # : jdk
 
-tools/jlink/JLinkTest.java 000000 generic-all
\ No newline at end of file
+tools/jlink/JLinkTest.java 000000 generic-all
+
+java/net/httpclient/http2/HpackBinaryTestDriver.java 000000 generic-all
+