Merge ~vpa1977/ubuntu/+source/openjdk-lts:02_jdk_11_specific into ubuntu/+source/openjdk-lts:ubuntu/devel

[Vladimir Petko]

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

Summary of changes:
 - exclude javadoc tests (broken by the debian patch)
 - drop openjdk-17-specific changes:
    - patches for tests that do not exist in 11
    - system gtest can not be used because it is too new for this JDK
 - refresh test patches
 - disable autopkgtest (just call java and javac) since for those to pass we need to supply native image now and without it tests are not very informative (we already do it for Java 17). Future work here is to package native test image and enable tests back.

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

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

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

[Vladimir Petko (vpa1977)]

amd64 --> /~vpa1977/+archive/ubuntu/openjdk-tiers2/+build/25984072
----------------cut----------------------------------------------
Platform: amd64
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 1,947
[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-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for langtools ---------------
Test results: passed: 3,922
[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-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for jaxp ---------------
Test results: passed: 440
[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-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for jdk ---------------
(xfwm4:460900): dbind-WARNING **: 04:44:30.834: 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:460900): xfwm4-WARNING **: 04:44:31.326: Another compositing manager is running on screen 0
(xfwm4:460900): xfwm4-WARNING **: 04:44:31.328: Failed to connect to session manager: Failed to connect to the session manager: SESSION_MANAGER environment variable not defined
Test results: passed: 5,329
[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-11-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): 21614.67
 System time (seconds): 1311.39
 Percent of CPU this job got: 323%
 Elapsed (wall clock) time (h:mm:ss or m:ss): 1:57:59
 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): 4851200
 Average resident set size (kbytes): 0
 Major (requiring I/O) page faults: 1341
 Minor (reclaiming a frame) page faults: 343350593
 Voluntary context switches: 47559698
 Involuntary context switches: 29074215
 Swaps: 0
 File system inputs: 2292264
 File system outputs: 67117984
 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: 1,947
[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-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary ...

[Graham Inggs (ginggs)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index c18925b..9ab7e64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,13 @@
-openjdk-lts (11.0.18+10-0ubuntu5) UNRELEASED; urgency=medium
+openjdk-lts (11.0.18+10-0ubuntu5) lunar; urgency=medium
 
   * d/control: add jtreg6 dependencies, regenerate control.
   * d/t/{jdk,hotspot,jaxp,lantools}: run tier1 and tier2 jtreg tests only,
     add test options from OpenJDK makefile.
   * d/t/*: fix test environment: add missing -nativepath (LP: #2001563).
   * d/t/jdk: provide dbus session for the window manager (LP: #2001576).
-  * d/p/build_gtest.patch: build OpenJDK with the system googletest
-    (LP: #2012316).
   * d/p/*: add patches for jtreg tests:
     - disable-thumb-assertion.patch: fix JDK-8305481.
     - update-assertion-for-armhf.patch: fix JDK-8305480.
-    - misalign-pointer-for-armhf.patch: packaging-specific patch to fix test
-      failure introduced by d/p/m68k-support.diff.
     - log-generated-classes-test.patch: workaround JDK-8166162.
     - update-permission-test.patch: add security permissions for testng 7.
     - ldap-timeout-test-use-ip.patch, test-use-ip-address.patch: Ubuntu-specific
@@ -20,9 +16,11 @@ openjdk-lts (11.0.18+10-0ubuntu5) UNRELEASED; urgency=medium
   * 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/p/exclude-broken-tests.patch: add OpenJDK 11 failures.
   * d/t/jtreg-autopkgtest.in: pass JTREG home to locate junit.jar, regenerate
     d/t/jtreg-autopkgtest.sh (LP: #2016206).
+  * d/t/control.in: disable jtreg autopkgtests in line with openjdk 17,
+    regenerate control (LP: #2016438).
 
  -- Vladimir Petko <[e-mail]>  Fri, 14 Apr 2023 11:29:59 +1200
 
diff --git a/debian/patches/build_gtest.patch b/debian/patches/build_gtest.patch
deleted file mode 100644
index 0d7f6ea..0000000
--- a/debian/patches/build_gtest.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Add support for building with the system google test
- A major portion of hotspot tests require google test.
- In order to get tier1 tests passing the package should build
- with the system google test.
-Author: Vladimir Petko <[e-mail]>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openjdk-20/+bug/2012316
-Last-Update: 2023-04-13
---- a/make/autoconf/lib-tests.m4
-+++ b/make/autoconf/lib-tests.m4
-@@ -36,6 +36,8 @@
-     AC_MSG_CHECKING([for gtest])
-     if test "x${with_gtest}" = xno; then
-       AC_MSG_RESULT([no, disabled])
-+    elif test "x${with_gtest}" = xsystem; then
-+      GTEST_FRAMEWORK_SRC=/usr/src/googletest
-     elif test "x${with_gtest}" = xyes; then
-       AC_MSG_RESULT([no, error])
-       AC_MSG_ERROR([--with-gtest must have a value])
---- a/test/hotspot/gtest/gtestMain.cpp
-+++ b/test/hotspot/gtest/gtestMain.cpp
-@@ -230,7 +230,7 @@
-   bool is_vmassert_test = false;
-   bool is_othervm_test = false;
-   // death tests facility is used for both regular death tests, other vm and vmassert tests
--  if (::testing::internal::GTEST_FLAG(internal_run_death_test).length() > 0) {
-+  if (::testing::GTEST_FLAG(internal_run_death_test).length() > 0) {
-     // when we execute death test, filter value equals to test name
-     const char* test_name = ::testing::GTEST_FLAG(filter).c_str();
-     const char* const othervm_suffix = "_other_vm"; // TEST_OTHER_VM
diff --git a/debian/patches/disable-thumb-assertion.patch b/debian/patches/disable-thumb-assertion.patch
index 30d0243..cdd8e1a 100644
--- a/debian/patches/disable-thumb-assertion.patch
+++ b/debian/patches/disable-thumb-assertion.patch
@@ -5,11 +5,11 @@ Bug: https://bugs.openjdk.org/browse/JDK-8305481
 Last-Update: 2023-03-30
 --- a/test/hotspot/gtest/runtime/test_os.cpp
 +++ b/test/hotspot/gtest/runtime/test_os.cpp
-@@ -844,7 +844,7 @@
+@@ -347,7 +347,7 @@
  }
  
  TEST_VM(os, is_first_C_frame) {
--#if !defined(_WIN32) && !defined(ZERO)
+-#ifndef _WIN32
 +#if !defined(_WIN32) && !defined(ZERO) && !defined(__thumb__)
    frame invalid_frame;
    EXPECT_TRUE(os::is_first_C_frame(&invalid_frame)); // the frame has zeroes for all values
diff --git a/debian/patches/exclude-broken-tests.patch b/debian/patches/exclude-broken-tests.patch
index 0eb04d5..2a9983b 100644
--- a/debian/patches/exclude-broken-tests.patch
+++ b/debian/patches/exclude-broken-tests.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 Last-Update: 2023-03-24
 --- a/test/hotspot/jtreg/ProblemList.txt
 +++ b/test/hotspot/jtreg/ProblemList.txt
-@@ -38,6 +38,22 @@
+@@ -38,6 +38,26 @@
  #
  #############################################################################
  
@@ -25,12 +25,16 @@ Last-Update: 2023-03-24
 +runtime/cds/appcds/jcmd/JCmdTestFileSafety.java  000000 generic-all
 +runtime/cds/appcds/jcmd/JCmdTestStaticDump.java  000000 generic-all
 +
++# Unexpected exit from the test
++
++runtime/NMT/SafepointPollingPages.java 000000 generic-all
++
  # :hotspot_compiler
  
- compiler/ciReplay/TestSAServer.java 8029528 generic-all
+ compiler/aot/verification/vmflags/TrackedFlagTest.java 8215224 generic-all
 --- a/test/langtools/ProblemList.txt
 +++ b/test/langtools/ProblemList.txt
-@@ -23,6 +23,11 @@
+@@ -23,6 +23,32 @@
  #
  ###########################################################################
  
@@ -39,12 +43,33 @@ Last-Update: 2023-03-24
 +
 +jdk/jshell/JdiListeningLocalhostExecutionControlTest.java 0000000 generic-all
 +
++# tests failing due to disable-doclint-by-default.diff
++
++jdk/javadoc/doclet/testSupplementary/TestSupplementary.java 0000000 generic-all
++jdk/javadoc/doclet/testPackageHtml/TestPackageHtml.java 0000000 generic-all
++jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java 0000000 generic-all
++jdk/javadoc/doclet/testStylesheet/TestStylesheet.java 0000000 generic-all
++jdk/javadoc/doclet/testSeeTag/TestSeeTag.java 0000000 generic-all
++jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java 0000000 generic-all
++jdk/javadoc/doclet/testBadHtml/TestBadHtml.java 0000000 generic-all
++jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java 0000000 generic-all
++jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/TestNonInlineHtmlTagRemoval.java 0000000 generic-all
++jdk/javadoc/doclet/dupThrowsTags/TestDupThrowsTags.java 0000000 generic-all
++jdk/javadoc/doclet/testLinkOption/TestLinkOption.java 0000000 generic-all
++jdk/javadoc/doclet/T6735320/T6735320.java 0000000 generic-all
++jdk/javadoc/doclet/testValueTag/TestValueTag.java 0000000 generic-all
++jdk/javadoc/tool/modules/Modules.java 0000000 generic-all
++jdk/javadoc/doclet/testWarnings/TestWarnings.java 0000000 generic-all
++jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java 0000000 generic-all
++jdk/javadoc/tool/doclint/DocLintTest.java 0000000 generic-all
++jdk/javadoc/doclet/testBadPackageFileInJar/TestBadPackageFileInJar.java 0000000 generic-all
++
  ###########################################################################
  #
  # javadoc
 --- a/test/jdk/ProblemList.txt
 +++ b/test/jdk/ProblemList.txt
-@@ -109,6 +109,49 @@
+@@ -110,6 +110,49 @@
  #
  #############################################################################
  
@@ -94,11 +119,3 @@ Last-Update: 2023-03-24
  ############################################################################
  
  # jdk_awt
-@@ -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
--java/lang/invoke/lambda/LambdaFileEncodingSerialization.java    8249079 linux-x64
- 
- ############################################################################
- 
diff --git a/debian/patches/misalign-pointer-for-armhf.patch b/debian/patches/misalign-pointer-for-armhf.patch
deleted file mode 100644
index 9117554..0000000
--- a/debian/patches/misalign-pointer-for-armhf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Misalign address in the test rather than structure
- mk68-support.diff aligned metaspace structures by 4 bytes breaking the test.
- Add 1 to address type rather than aligned structure to produce misaligned pointer.
---- a/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp
-+++ b/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp
-@@ -61,7 +61,7 @@
-     ASSERT_TRUE(MetaspaceObj::is_valid(p));
- 
-     // A misaligned object shall not be recognized
--    const MetaspaceObj* p_misaligned = (MetaspaceObj*)((address)p) + 1;
-+    const MetaspaceObj* p_misaligned = (MetaspaceObj*)((address)p + 1);
-     ASSERT_FALSE(MetaspaceObj::is_valid(p_misaligned));
- 
-     // Test VirtualSpaceList::contains
-@@ -72,7 +72,7 @@
-     ASSERT_TRUE(vslist->contains((MetaWord*)p));
- 
-     // A misaligned pointer shall still be recognized by list::contains
--    ASSERT_TRUE(vslist->contains((MetaWord*)((address)p) + 1));
-+    ASSERT_TRUE(vslist->contains((MetaWord*)((address)p + 1)));
- 
-     // Now for some bogus values
-     ASSERT_FALSE(MetaspaceObj::is_valid((MetaspaceObj*)NULL));
diff --git a/debian/patches/series b/debian/patches/series
index bf4cb7f..595607b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,12 +32,10 @@ reproducible-copyright-headers.diff
 reproducible-build-user.diff
 reproducible-build-jmod.diff
 hotspot-test-fix-npe-on-missing-file.patch
-build_gtest.patch
 disable-thumb-assertion.patch
 update-assertion-for-armhf.patch
-misalign-pointer-for-armhf.patch
 log-generated-classes-test.patch
 update-permission-test.patch
 ldap-timeout-test-use-ip.patch
 test-use-ip-address.patch
-exclude-broken-tests.patch
\ No newline at end of file
+exclude-broken-tests.patch
diff --git a/debian/rules b/debian/rules
index 8dd64ba..5ba542f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -504,7 +504,6 @@ COMMON_CONFIGURE_ARGS += \
 	--with-pcsclite=system \
 	--disable-warnings-as-errors \
 	--disable-javac-server \
-	--with-gtest=system \
 
 ifeq (,$(filter $(distrel),jessie stretch precise trusty xenial))
   COMMON_CONFIGURE_ARGS += \
diff --git a/debian/tests/control b/debian/tests/control
index e263c54..96c01d4 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,7 +1,15 @@
-Tests: hotspot, jaxp, langtools
-Depends: @, default-jre-headless, jtreg6:native (>= 6+1-0~), testng:native, build-essential
-Restrictions: allow-stderr, skippable, flaky
+Test-Command: java --version
+Depends: openjdk-11-jre-headless
+Restrictions: superficial
 
-Tests: jdk
-Depends: @, default-jre-headless, jtreg6:native (>= 6+1-0~), testng:native, build-essential, xfwm4:native, xvfb, dbus-x11, zip
-Restrictions: allow-stderr, skippable, flaky
+Test-Command: javac --version
+Depends: openjdk-11-jdk-headless
+Restrictions: superficial
+
+#Tests: hotspot, jaxp, langtools
+#Depends: @, default-jre-headless, jtreg6:native (>= 6+1-0~), testng:native, build-essential
+#Restrictions: allow-stderr, skippable, flaky
+
+#Tests: jdk
+#Depends: @, default-jre-headless, jtreg6:native (>= 6+1-0~), testng:native, build-essential, xfwm4:native, xvfb, dbus-x11, zip
+#Restrictions: allow-stderr, skippable, flaky
diff --git a/debian/tests/control.in b/debian/tests/control.in
index a54a506..1659327 100644
--- a/debian/tests/control.in
+++ b/debian/tests/control.in
@@ -1,7 +1,15 @@
-Tests: hotspot, jaxp, langtools
-Depends: @, default-jre-headless, @jtreg_pkg@:native (>= @min_jtreg_version@), testng:native, build-essential
-Restrictions: allow-stderr, skippable, flaky
+Test-Command: java --version
+Depends: openjdk-11-jre-headless
+Restrictions: superficial
 
-Tests: jdk
-Depends: @, default-jre-headless, @jtreg_pkg@:native (>= @min_jtreg_version@), testng:native, build-essential, xfwm4:native, xvfb, dbus-x11, zip
-Restrictions: allow-stderr, skippable, flaky
+Test-Command: javac --version
+Depends: openjdk-11-jdk-headless
+Restrictions: superficial
+
+#Tests: hotspot, jaxp, langtools
+#Depends: @, default-jre-headless, @jtreg_pkg@:native (>= @min_jtreg_version@), testng:native, build-essential
+#Restrictions: allow-stderr, skippable, flaky
+
+#Tests: jdk
+#Depends: @, default-jre-headless, @jtreg_pkg@:native (>= @min_jtreg_version@), testng:native, build-essential, xfwm4:native, xvfb, dbus-x11, zip
+#Restrictions: allow-stderr, skippable, flaky