Merge ~vpa1977/ubuntu/+source/jtreg7:fix-target-compat into ubuntu/+source/jtreg7:ubuntu/devel

Proposed by Vladimir Petko
Status: Merged
Merged at revision: 73b4eb9f24c446f8c5e0fd4587d277cdc2d99989
Proposed branch: ~vpa1977/ubuntu/+source/jtreg7:fix-target-compat
Merge into: ubuntu/+source/jtreg7:ubuntu/devel
Diff against target: 76 lines (+24/-5)
3 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/patches/opentest4j-reporting-01-gradle-compatibility.patch (+14/-4)
Reviewer Review Type Date Requested Status
Pushkar Kulkarni (community) Approve
git-ubuntu import Pending
Review via email: mp+466631@code.launchpad.net

Description of the change

This is an upload ahead of Debian to support openjdk-11 jtreg tests[1]

Changes:
 * d/p/opentest4j-reporting-01-gradle-compatibility.patch: set
   source/targetCompatibility 8 to support openjdk 11 jtreg tests
   (LP: #2067520).

PPA: ppa:vpa1977/october-21[2]

Testing:
 - openjdk-11 tests[3]
   There are no jtreg-related test failures on amd64.
   TestEC fails due to SecurityManager exception when ran in agentvm mode in conjunction with other tests. The test passes when ran separately.
 - Check class versions in the package[1].
   All classes are now built with source/target compatibility 8/11.

[1] https://salsa.debian.org/java-team/jtreg7/-/merge_requests/4
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/october-21
[3] https://code.launchpad.net/~vpa1977/ubuntu/+source/jtreg7/+git/jtreg7/+merge/466631/comments/1256552

To post a comment you must log in.
Revision history for this message
Vladimir Petko (vpa1977) wrote :
Download full text (24.5 KiB)

~/check-build.sh https://launchpad.net/~vpa1977/+archive/ubuntu/october-21/+sourcepub/16158693/+listing-archive-extra
amd64 --> /~vpa1977/+archive/ubuntu/october-21/+build/28497053
----------------cut----------------------------------------------
Platform: amd64
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 1,968
[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,930
[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: 445
[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:468163): dbind-WARNING **: 08:41:29.128: 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:468163): xfwm4-WARNING **: 08:41:29.688: Another compositing manager is running on screen 0
(xfwm4:468163): xfwm4-WARNING **: 08:41:29.690: Failed to connect to session manager: Failed to connect to the session manager: SESSION_MANAGER environment variable not defined
FAILED: sun/security/ec/TestEC.java
Test results: passed: 5,371; failed: 1
FAILED: sun/security/ec/TestEC.java
Test results: failed: 1
FAILED: sun/security/ec/TestEC.java
Test results: failed: 1
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
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): 22220.17
 System time (seconds): 1361.26
 Percent of CPU this job got: 138%
 Elapsed (wall clock) time (h:mm:ss or m:ss): 4:43:39
 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): 6547228
 Average resident set size (kbytes): 0
 Major (requiring I/O) page faults: 748
 Minor (reclaiming a frame) page faults: 345182083
 Voluntary context switches: 53833347
 Involuntary context switches: 19502429
 Swaps: 0
 File system inputs: 1697168
 File system outputs: 68994696
 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,968
[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-j...

Revision history for this message
Pushkar Kulkarni (pushkarnk) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 3d02eb7..5ee6664 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+jtreg7 (7.3.1+1+ds1-2ubuntu1) oracular; urgency=medium
7+
8+ * d/p/opentest4j-reporting-01-gradle-compatibility.patch: set
9+ source/targetCompatibility 8 to support openjdk 11 jtreg tests
10+ (LP: #2067520).
11+
12+ -- Vladimir Petko <vladimir.petko@canonical.com> Thu, 30 May 2024 08:35:04 +1200
13+
14 jtreg7 (7.3.1+1+ds1-2) unstable; urgency=medium
15
16 [ Pushkar Kulkarni ]
17diff --git a/debian/control b/debian/control
18index 5200c7b..7e167ce 100644
19--- a/debian/control
20+++ b/debian/control
21@@ -1,7 +1,8 @@
22 Source: jtreg7
23 Section: java
24 Priority: optional
25-Maintainer: Vladimir Petko <vladimir.petko@canonical.com>
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Vladimir Petko <vladimir.petko@canonical.com>
28 Uploaders: Matthias Klose <doko@debian.org>
29 Build-Depends:
30 ant,
31diff --git a/debian/patches/opentest4j-reporting-01-gradle-compatibility.patch b/debian/patches/opentest4j-reporting-01-gradle-compatibility.patch
32index da92702..f939c76 100644
33--- a/debian/patches/opentest4j-reporting-01-gradle-compatibility.patch
34+++ b/debian/patches/opentest4j-reporting-01-gradle-compatibility.patch
35@@ -3,19 +3,29 @@ Author: Emmanuel Bourg <ebourg@apache.org>
36 Forwarded: not-needed
37 --- /dev/null
38 +++ b/opentest4j-reporting/build.gradle
39-@@ -0,0 +1,3 @@
40+@@ -0,0 +1,10 @@
41++plugins {
42++ id 'java'
43++}
44++
45 +allprojects {
46 + apply plugin: 'java'
47 +}
48++
49++sourceCompatibility = "1.8"
50++targetCompatibility = "1.8"
51 --- /dev/null
52-+++ b//opentest4j-reporting/events/build.gradle
53-@@ -0,0 +1,13 @@
54++++ b/opentest4j-reporting/events/build.gradle
55+@@ -0,0 +1,16 @@
56 +/*
57 +plugins {
58 + `java-conventions`
59 +}
60 +*/
61 +
62++sourceCompatibility = "1.8"
63++targetCompatibility = "1.8"
64++
65 +dependencies {
66 + compile(project(":schema"))
67 +// testImplementation(libs.archunit)
68@@ -24,7 +34,7 @@ Forwarded: not-needed
69 +// testImplementation(libs.xmlunit.assertj)
70 +}
71 --- /dev/null
72-+++ b//opentest4j-reporting/settings.gradle
73++++ b/opentest4j-reporting/settings.gradle
74 @@ -0,0 +1,17 @@
75 +rootProject.name = "open-test-reporting"
76 +/*

Subscribers

People subscribed via source and target branches