Merge ~vpa1977/ubuntu/+source/jtreg6:switch-to-makefile into ubuntu/+source/jtreg6:ubuntu/devel

[Vladimir Petko]

Changes:
 - use Makefile to build jtreg instead of ant build. See https://bugs.openjdk.org/browse/CODETOOLS-7903517

ppa: ppa:vpa1977/jtreg-makefile [1]

Testing:
 - rebuild openjdk-11 and openjdk-17 in ppa. Check that there are no regressions
related to jtreg configuration.
Results: no failures on amd64 for openjdk-11 and -17 which means that jtreg setup is correct and the testsuite can run successfully.

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/jtreg-makefile

[Vladimir Petko (vpa1977)]

openjdk-11 test results

----------------cut----------------------------------------------
Platform: amd64
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 1,958
[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,926
[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: 443
[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:461660): dbind-WARNING **: 03:02:00.761: 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:461660): xfwm4-WARNING **: 03:02:01.239: Another compositing manager is running on screen 0
(xfwm4:461660): xfwm4-WARNING **: 03:02:01.241: Failed to connect to session manager: Failed to connect to the session manager: SESSION_MANAGER environment variable not defined
Test results: passed: 5,345
[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): 20654.46
 System time (seconds): 1268.89
 Percent of CPU this job got: 320%
 Elapsed (wall clock) time (h:mm:ss or m:ss): 1:53:54
 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): 6547160
 Average resident set size (kbytes): 0
 Major (requiring I/O) page faults: 1216
 Minor (reclaiming a frame) page faults: 345030268
 Voluntary context switches: 46802256
 Involuntary context switches: 28465014
 Swaps: 0
 File system inputs: 2294976
 File system outputs: 69241168
 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,958
[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...

[Vladimir Petko (vpa1977)]

openjdk-17 test
------------------
----------------cut----------------------------------------------
Platform: amd64
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 2,549
[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,243
[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: 466
[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:1666673): dbind-WARNING **: 01:46:21.155: 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:1666673): xfwm4-WARNING **: 01:46:21.631: Another compositing manager is running on screen 0
(xfwm4:1666673): xfwm4-WARNING **: 01:46:21.633: Failed to connect to session manager: Failed to connect to the session manager: SESSION_MANAGER environment variable not defined
Test results: passed: 5,872
[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): 26585.88
 System time (seconds): 1724.57
 Percent of CPU this job got: 336%
 Elapsed (wall clock) time (h:mm:ss or m:ss): 2:20:22
 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): 7376500
 Average resident set size (kbytes): 0
 Major (requiring I/O) page faults: 693
 Minor (reclaiming a frame) page faults: 439677346
 Voluntary context switches: 73192259
 Involuntary context switches: 45968471
 Swaps: 0
 File system inputs: 3763336
 File system outputs: 176096576
 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,549
[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 ---------------...

[Lukas Märdian (slyon)]

Thank you, lgtm!

The change is reasonable, given "make" is the officially supported buildsystem upstream and the support for "ant" (make/build.xml) building got dropped with more recent versions.

diff'ing the resulting .deb binaries showed not unexpected changes on my side. Thank you for providing PPA test builds and running extensive test suites against openjdk-11 and openjdk-17! Those make me feel much more comfortable sponsoring this change.

A small nitpick are some trailing whitespace characters in your new patch (debian/patches/add-release-options.patch). I'm not going to block on this, but maybe you can update your tooling/editor, to highlight such things in the future. And kudos for providing proper DEP-3 headers!

One suggested I have for you, is to work with Debian to get this change accepted, too.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 66e66b2..21cc448 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jtreg6 (6.1+2-1ubuntu3) mantic; urgency=medium
+
+  * Use Makefile to build jtreg (LP: #2031041).
+    - Use --release option in Makefile compile options.
+    - d/p/*: drop build.xml patches.
+    - d/control: add libguice-java, zip.
+
+ -- Vladimir Petko <[e-mail]>  Fri, 11 Aug 2023 09:13:15 +1200
+
 jtreg6 (6.1+2-1ubuntu2) mantic; urgency=medium
 
   * d/control: use Recommends: for libtestng7-java dependency (LP: #2026215).
diff --git a/debian/control b/debian/control
index f50fe30..cb573d7 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,9 @@ Build-Depends:
  libhamcrest-java,
  libtestng7-java,
  libasmtools-java,
- libjcommander-java
+ libjcommander-java,
+ libguice-java,
+ zip
 Standards-Version: 4.6.0
 Vcs-Git: https://salsa.debian.org/java-team/jtreg.git
 Vcs-Browser: https://salsa.debian.org/java-team/jtreg
diff --git a/debian/patches/add-asmtools-to-classpath.patch b/debian/patches/add-asmtools-to-classpath.patch
deleted file mode 100644
index ee79b17..0000000
--- a/debian/patches/add-asmtools-to-classpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Provide path to asmtools.jar
- A number of hotspot tests use java asmtools. Provide path to asmtools.jar
-Author: Vladimir Petko <[e-mail]>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/jtreg6/+bug/2015011
-Last-Update: 2023-04-03
---- a/make/build.xml
-+++ b/make/build.xml
-@@ -144,7 +144,7 @@
-             <manifest>
-                 <attribute name="Built-By" value="${user.name}"/>
-                 <attribute name="Main-Class" value="com.sun.javatest.regtest.Main"/>
--                <attribute name="Class-Path" value="javatest.jar jh.jar junit.jar"/>
-+                <attribute name="Class-Path" value="javatest.jar jh.jar junit.jar asmtools.jar"/>
-                 <attribute name="jtreg-Name" value="jtreg"/>
-                 <attribute name="jtreg-Version" value="${build.version}"/>
-                 <attribute name="jtreg-Milestone" value="${build.milestone}"/>
diff --git a/debian/patches/add-release-options.patch b/debian/patches/add-release-options.patch
new file mode 100644
index 0000000..f34a5b5
--- /dev/null
+++ b/debian/patches/add-release-options.patch
@@ -0,0 +1,31 @@
+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 <[e-mail]>
+Forwarded: not-needed
+Last-Update: 2023-08-11
+--- a/make/Defs.gmk
++++ b/make/Defs.gmk
+@@ -149,7 +149,7 @@
+ 
+ # Only use -source -target, to support legacy platforms, when building with JDK 8
+ # Otherwise, use default values for $JDKHOME/bin/javac
+-SUPPORT_OLD_SOURCE_TARGET = $(shell $(JDKJAVAC) -version 2>&1 | grep '[8]' > /dev/null && echo true )
++SUPPORT_OLD_SOURCE_TARGET = $(shell $(JDKJAVAC) -version 2>&1 | grep '1\.8\.' > /dev/null && echo true )
+ 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 @@
+     REGTEST_TOOL_PATCH_JAVA_BASE_OPTIONS =
+ else
+     EXTRA_LINT_OPTS = -rawtypes,-unchecked
+-    REGTEST_TOOL_PATCH_JAVA_BASE_OPTIONS = --patch-module java.base=$(JAVADIR)
++    REGTEST_TOOL_PATCH_JAVA_BASE_OPTIONS =
++    OLD_JAVAC_SOURCE_TARGET = --release 8
++    AGENT_JAVAC_SOURCE_TARGET = --release 8
++    TOOL_JAVAC_SOURCE_TARGET = --release 8
+ endif 
+ 
+ ifdef JDK5HOME
diff --git a/debian/patches/series b/debian/patches/series
index e8a711b..bd5ef3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
+add-release-options.patch
 launchers.patch
 add-jcommander-to-classpath.patch
-use-release-instead-of-source-target.patch
-add-asmtools-to-classpath.patch
 add-logger-to-classpath.patch
diff --git a/debian/patches/use-release-instead-of-source-target.patch b/debian/patches/use-release-instead-of-source-target.patch
deleted file mode 100644
index a0ca08a..0000000
--- a/debian/patches/use-release-instead-of-source-target.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: use 'release' instead of 'target' and 'source'
- When running jtreg with openjdk-8 and the agentvm it will fail to run with
- "java.lang.NoSuchMethodError: java.nio.ByteBuffer.flip()Ljava/nio/ByteBuffer".
- An easy fix is to replace "source=1.7 target=1.7" with "release=7" in the
- ant build script.
-Author: Tiago Stürmer Daitx <[e-mail]>
-Bug-Debian: https://bugs.debian.org/913853
-Bug-Ubuntu: https://launchpad.net/bugs/1803628
-Last-Update: 2018-11-01
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/make/build.xml
-+++ b/make/build.xml
-@@ -172,7 +172,7 @@
- 
-     <target name="-compile-jtreg.classes">
-         <mkdir dir="${build.classes.dir}"/>
--        <javac encoding="iso-8859-1" source="1.8" target="1.8"
-+        <javac encoding="iso-8859-1" release="8"
-             debug="true" debuglevel="source,lines"
-             srcdir="${src.classes.dir}"
-             destdir="${build.classes.dir}"
diff --git a/debian/rules b/debian/rules
index 405fe3f..dca8f04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,19 +11,23 @@ DATE         := $(shell dpkg-parsechangelog --show-field Date)
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	ant -f make/build.xml \
-	    -Dant.jar=/usr/share/java/ant.jar \
-	    -Djtreg.build.resources=/usr/share/java \
-	    -Djh.jar=/usr/share/java/jh.jar \
-	    -Djhall.jar=/usr/share/java/jhall.jar \
-	    -Djunit.jar=/usr/share/java/junit4.jar \
-	    -Dtestng.jar=/usr/share/java/testng.jar \
-	    -Djavatest.jar=/usr/share/java/javatest.jar \
-	    -Dasmtools.jar=/usr/share/java/asmtools.jar \
-	    -Dbuild.date.time='$(DATE)' \
-	    -Dbuild.version=$(VERSION) \
-	    -Dbuild.milestone=src \
-	    -Dbuild.number=$(BUILD_NUMBER)
+	cd make && \
+	make ANT=/usr/share/ant                               \
+		ANT_JAR=/usr/share/java/ant.jar                   \
+		ASMTOOLS_JAR=/usr/share/java/asmtools.jar         \
+		BUILDDIR=../dist                                  \
+		BUILD_MILESTONE=src                               \
+		BUILD_NUMBER=$(BUILD_NUMBER)                      \
+		BUILD_VERSION=$(VERSION)                          \
+		BUILD_VERSION_STRING="$(VERSION)+$(BUILD_NUMBER)" \
+		GOOGLE_GUICE_JAR=/usr/share/java/guice.jar        \
+		HAMCREST_JAR=/usr/share/java/hamcrest.jar         \
+		JAVATEST_JAR=/usr/share/java/javatest.jar         \
+		JCOMMANDER_JAR=/usr/share/java/jcommander.jar     \
+		JDKHOME=$(JAVA_HOME)                              \
+		JUNIT_JAR=/usr/share/java/junit4.jar              \
+		TESTNG_JAR=/usr/share/java/testng.jar
+	mv dist/images/jtreg dist/
 	dh_auto_build
 
 	# Generate the manpages