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
diff --git a/debian/changelog b/debian/changelog
index 2d94c5a..000e17d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1openjdk-lts (11.0.17+8-1ubuntu3~ppa2) lunar; urgency=medium
2
3 * debian/tests/hotspot,jdk: Use -nativepath for jtreg6 tests (LP: #2001563)
4 * debian/tests/start-xvfb.sh: run window manager in dbus session (LP: #2001576)
5 * debian/rules: Add lunar to jtreg selection list (LP: #2001559)
6
7 -- Vladimir Petko <vladimir.petko@canonical.com> Wed, 04 Jan 2023 09:26:51 +1300
8
1openjdk-lts (11.0.17+8-1ubuntu2) kinetic-security; urgency=medium9openjdk-lts (11.0.17+8-1ubuntu2) kinetic-security; urgency=medium
210
3 * OpenJDK 11.0.17 release, build 8.11 * OpenJDK 11.0.17 release, build 8.
diff --git a/debian/rules b/debian/rules
index 56b8a4f..b012c83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -151,7 +151,7 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
151 NJOBS = $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))151 NJOBS = $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
152endif152endif
153153
154ifneq (,$(filter $(distrel), focal jammy kinetic))154ifneq (,$(filter $(distrel), focal jammy kinetic lunar))
155 jtreg_pkg = jtreg6155 jtreg_pkg = jtreg6
156else ifneq (,$(filter $(distrel), sid bookworm bullseye))156else ifneq (,$(filter $(distrel), sid bookworm bullseye))
157 jtreg_pkg = jtreg157 jtreg_pkg = jtreg
@@ -1247,7 +1247,7 @@ install: packaging-files
12471247
1248 chmod -R u+w $(d)1248 chmod -R u+w $(d)
12491249
1250 : # use javaws from icedtea-netx 1250 : # use javaws from icedtea-netx
1251 find $(d) -name 'javaws*' | xargs -r rm -f1251 find $(d) -name 'javaws*' | xargs -r rm -f
12521252
1253 : # install default jvm config file1253 : # install default jvm config file
diff --git a/debian/tests/hotspot b/debian/tests/hotspot
index 3739a26..65252c6 100755
--- a/debian/tests/hotspot
+++ b/debian/tests/hotspot
@@ -4,7 +4,10 @@ set -o errtrace
4set -o pipefail4set -o pipefail
5set -o nounset5set -o nounset
66
7debian/tests/jtreg-autopkgtest.sh hotspot \7jt_options="${JTREG_OPTIONS:-}"
8jt_options+=" -nativepath:./build/support/test/hotspot/jtreg/native/lib"
9
10JTREG_OPTIONS=${jt_options} debian/tests/jtreg-autopkgtest.sh hotspot \
8 -exclude:test/hotspot/jtreg/ProblemList.txt \11 -exclude:test/hotspot/jtreg/ProblemList.txt \
9 -exclude:debian/failed-tests-problemlist.txt \12 -exclude:debian/failed-tests-problemlist.txt \
10 -dir:test/hotspot/jtreg \13 -dir:test/hotspot/jtreg \
diff --git a/debian/tests/jdk b/debian/tests/jdk
index ec2336e..894bf04 100755
--- a/debian/tests/jdk
+++ b/debian/tests/jdk
@@ -15,14 +15,17 @@ cleanup() {
15for sig in INT QUIT HUP TERM; do trap "cleanup; trap - $sig EXIT; kill -s $sig "'"$$"' "$sig"; done15for sig in INT QUIT HUP TERM; do trap "cleanup; trap - $sig EXIT; kill -s $sig "'"$$"' "$sig"; done
16trap cleanup EXIT16trap cleanup EXIT
1717
18export HOME="$(pwd)/jdk/test/"18export HOME="$(pwd)"
19export XAUTHORITY="${HOME}/.Xauthority"19export XAUTHORITY="${HOME}/.Xauthority"
20export DISPLAY=:1020export DISPLAY=:10
2121
22debian/tests/start-xvfb.sh 10 &22debian/tests/start-xvfb.sh 10 &
23sleep 323sleep 3
2424
25debian/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=$?25jt_options="${JTREG_OPTIONS:-}"
26jt_options+=" -nativepath:./build/support/test/jdk/jtreg/native/lib"
27
28JTREG_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=$?
2629
27[ $jtreg_exit -eq 77 ] && exit 7730[ $jtreg_exit -eq 77 ] && exit 77
2831
diff --git a/debian/tests/start-xvfb.sh b/debian/tests/start-xvfb.sh
index 423d73a..b635b5b 100755
--- a/debian/tests/start-xvfb.sh
+++ b/debian/tests/start-xvfb.sh
@@ -12,7 +12,7 @@ fi
12export HOME="${HOME:-${AUTOPKGTEST_TMP}}"12export HOME="${HOME:-${AUTOPKGTEST_TMP}}"
13export XAUTHORITY="${HOME}/.Xauthority"13export XAUTHORITY="${HOME}/.Xauthority"
1414
15exec xvfb-run --server-num=${1:-10} \15exec dbus-run-session xvfb-run --server-num=${1:-10} \
16 --error-file="${AUTOPKGTEST_ARTIFACTS}/xvfb-run.log" \16 --error-file="${AUTOPKGTEST_ARTIFACTS}/xvfb-run.log" \
17 --auth-file=${XAUTHORITY} \17 --auth-file=${XAUTHORITY} \
18 --server-args="-fbdir ${AUTOPKGTEST_TMP} -pixdepths 8 16 24 32 -extension GLX -screen 0 1600x900x24" \18 --server-args="-fbdir ${AUTOPKGTEST_TMP} -pixdepths 8 16 24 32 -extension GLX -screen 0 1600x900x24" \

Subscribers

People subscribed via source and target branches