Ubuntu
openjdk-lts package

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

  1. Git
  2. lp:~vpa1977/ubuntu/+source/openjdk-lts
  3. ubuntu/devel
  4. Merge into ubuntu/devel
Proposed by Vladimir Petko
Status: Merged
Merge reported by: Vladimir Petko
Merged at revision: 7c254ac1f067f29e4041c0c921bbaa59cae7a920
Proposed branch: ~vpa1977/ubuntu/+source/openjdk-lts:ubuntu/devel
Merge into: ubuntu/+source/openjdk-lts:ubuntu/devel
Diff against target: 91 lines (+20/-6)
5 files modified
debian/changelog (+8/-0)
debian/rules (+2/-2)
debian/tests/hotspot (+4/-1)
debian/tests/jdk (+5/-2)
debian/tests/start-xvfb.sh (+1/-1)
Reviewer Review Type Date Requested Status
git-ubuntu import Pending
Review via email: mp+435099@code.launchpad.net

Description of the change

This MR contains following changes:
  * debian/tests/hotspot,jdk: Use -nativepath for jtreg6 tests (LP: #2001563)
  * debian/tests/jdk: export dbus address for xfwm4 (LP: #2001576)
  * debian/rules: Add lunar to jtreg selection list (LP: #2001559)

It only modifies build procedure reducing number of jtreg test errors and retries

PPA:

https://launchpad.net/~vpa1977/+archive/ubuntu/jdk-fixes

Steps to test:

- Review package build logs from ppa:
  - build should succeed
  - tests requiring native libraries, e.g. https://launchpadlibrarian.net/644062097/native-error-hotspot.txt and https://launchpadlibrarian.net/644062132/native-error-jdk.txt should pass
  - tests requiring X11 display should pass, e.g. java/beans/XMLEncoder/Test6570354.java

To post a comment you must log in.
~vpa1977/ubuntu/+source/openjdk-lts:ubuntu/devel updated
e738c64... by Vladimir Petko

run window manager in a dbus session

7c254ac... by Vladimir Petko

changelog

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 2d94c5a..000e17d 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+openjdk-lts (11.0.17+8-1ubuntu3~ppa2) lunar; urgency=medium
7+
8+ * debian/tests/hotspot,jdk: Use -nativepath for jtreg6 tests (LP: #2001563)
9+ * debian/tests/start-xvfb.sh: run window manager in dbus session (LP: #2001576)
10+ * debian/rules: Add lunar to jtreg selection list (LP: #2001559)
11+
12+ -- Vladimir Petko <vladimir.petko@canonical.com> Wed, 04 Jan 2023 09:26:51 +1300
13+
14 openjdk-lts (11.0.17+8-1ubuntu2) kinetic-security; urgency=medium
15
16 * OpenJDK 11.0.17 release, build 8.
17diff --git a/debian/rules b/debian/rules
18index 56b8a4f..b012c83 100755
19--- a/debian/rules
20+++ b/debian/rules
21@@ -151,7 +151,7 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
22 NJOBS = $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
23 endif
24
25-ifneq (,$(filter $(distrel), focal jammy kinetic))
26+ifneq (,$(filter $(distrel), focal jammy kinetic lunar))
27 jtreg_pkg = jtreg6
28 else ifneq (,$(filter $(distrel), sid bookworm bullseye))
29 jtreg_pkg = jtreg
30@@ -1247,7 +1247,7 @@ install: packaging-files
31
32 chmod -R u+w $(d)
33
34- : # use javaws from icedtea-netx
35+ : # use javaws from icedtea-netx
36 find $(d) -name 'javaws*' | xargs -r rm -f
37
38 : # install default jvm config file
39diff --git a/debian/tests/hotspot b/debian/tests/hotspot
40index 3739a26..65252c6 100755
41--- a/debian/tests/hotspot
42+++ b/debian/tests/hotspot
43@@ -4,7 +4,10 @@ set -o errtrace
44 set -o pipefail
45 set -o nounset
46
47-debian/tests/jtreg-autopkgtest.sh hotspot \
48+jt_options="${JTREG_OPTIONS:-}"
49+jt_options+=" -nativepath:./build/support/test/hotspot/jtreg/native/lib"
50+
51+JTREG_OPTIONS=${jt_options} debian/tests/jtreg-autopkgtest.sh hotspot \
52 -exclude:test/hotspot/jtreg/ProblemList.txt \
53 -exclude:debian/failed-tests-problemlist.txt \
54 -dir:test/hotspot/jtreg \
55diff --git a/debian/tests/jdk b/debian/tests/jdk
56index ec2336e..894bf04 100755
57--- a/debian/tests/jdk
58+++ b/debian/tests/jdk
59@@ -15,14 +15,17 @@ cleanup() {
60 for sig in INT QUIT HUP TERM; do trap "cleanup; trap - $sig EXIT; kill -s $sig "'"$$"' "$sig"; done
61 trap cleanup EXIT
62
63-export HOME="$(pwd)/jdk/test/"
64+export HOME="$(pwd)"
65 export XAUTHORITY="${HOME}/.Xauthority"
66 export DISPLAY=:10
67
68 debian/tests/start-xvfb.sh 10 &
69 sleep 3
70
71-debian/tests/jtreg-autopkgtest.sh jdk -exclude:test/jdk/ProblemList.txt -exclude:debian/failed-tests-problemlist.txt test/jdk:jdk_stable && jtreg_exit=0 || jtreg_exit=$?
72+jt_options="${JTREG_OPTIONS:-}"
73+jt_options+=" -nativepath:./build/support/test/jdk/jtreg/native/lib"
74+
75+JTREG_OPTIONS=${jt_options} debian/tests/jtreg-autopkgtest.sh jdk -exclude:test/jdk/ProblemList.txt -exclude:debian/failed-tests-problemlist.txt test/jdk:jdk_stable && jtreg_exit=0 || jtreg_exit=$?
76
77 [ $jtreg_exit -eq 77 ] && exit 77
78
79diff --git a/debian/tests/start-xvfb.sh b/debian/tests/start-xvfb.sh
80index 423d73a..b635b5b 100755
81--- a/debian/tests/start-xvfb.sh
82+++ b/debian/tests/start-xvfb.sh
83@@ -12,7 +12,7 @@ fi
84 export HOME="${HOME:-${AUTOPKGTEST_TMP}}"
85 export XAUTHORITY="${HOME}/.Xauthority"
86
87-exec xvfb-run --server-num=${1:-10} \
88+exec dbus-run-session xvfb-run --server-num=${1:-10} \
89 --error-file="${AUTOPKGTEST_ARTIFACTS}/xvfb-run.log" \
90 --auth-file=${XAUTHORITY} \
91 --server-args="-fbdir ${AUTOPKGTEST_TMP} -pixdepths 8 16 24 32 -extension GLX -screen 0 1600x900x24" \

Subscribers

People subscribed via source and target branches