------------------------------------------------------------
revno: 730
committer: Matthias Klose <[email protected]>
branch nick: openjdk8
timestamp: Sun 2019-03-17 18:29:36 +0100
message:
[ Tiago Stürmer Daitx ]
* Update DEP8 tests:
- debian/tests/control: updated to allow stderr output and to remove
dpkg-dev dependency.
- debian/tests/jtdiff-autopkgtest.sh: use dpkg --print-architecture
instead of dpkg-architecture; log script name on any output.
- debian/tests/jtreg-autopkgtest.in: use dpkg --print-architecture instead
of dpkg-architecture; do not retain test temporary files; log script
name on any output.
- debian/tests/jtreg-autopkgtest.sh: regenerated.
modified:
debian/changelog
debian/tests/control
debian/tests/jdk
debian/tests/jtdiff-autopkgtest.sh
debian/tests/jtreg-autopkgtest.in
debian/tests/jtreg-autopkgtest.sh
--
lp:~openjdk/openjdk/openjdk8
https://code.launchpad.net/~openjdk/openjdk/openjdk8
Your team Debian Java Maintainers is subscribed to branch
lp:~openjdk/openjdk/openjdk8.
To unsubscribe from this branch go to
https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog 2019-03-17 17:24:49 +0000
+++ debian/changelog 2019-03-17 17:29:36 +0000
@@ -15,6 +15,17 @@
- S8210606: Improved data set handling.
- S8210866: Improve JPEG processing.
+ [ Tiago Stürmer Daitx ]
+ * Update DEP8 tests:
+ - debian/tests/control: updated to allow stderr output and to remove
+ dpkg-dev dependency.
+ - debian/tests/jtdiff-autopkgtest.sh: use dpkg --print-architecture
+ instead of dpkg-architecture; log script name on any output.
+ - debian/tests/jtreg-autopkgtest.in: use dpkg --print-architecture instead
+ of dpkg-architecture; do not retain test temporary files; log script
+ name on any output.
+ - debian/tests/jtreg-autopkgtest.sh: regenerated.
+
-- Matthias Klose <[email protected]> Sun, 17 Mar 2019 17:07:16 +0100
openjdk-8 (8u191-b12-2) unstable; urgency=high
=== modified file 'debian/tests/control'
--- debian/tests/control 2018-12-05 08:04:39 +0000
+++ debian/tests/control 2019-03-17 17:29:36 +0000
@@ -1,7 +1,7 @@
Tests: hotspot, langtools
-Depends: @, jtreg, testng, dpkg-dev, gcc
-Restrictions: skippable
+Depends: @, jtreg, testng, gcc
+Restrictions: allow-stderr, skippable
Tests: jdk
-Depends: @, jtreg, testng, dpkg-dev, gcc, xfwm4, xvfb, dbus-x11
-Restrictions: skippable
+Depends: @, jtreg, testng, gcc, xfwm4, xvfb, dbus-x11
+Restrictions: allow-stderr, skippable
=== modified file 'debian/tests/jdk'
--- debian/tests/jdk 2018-12-05 08:04:39 +0000
+++ debian/tests/jdk 2019-03-17 17:29:36 +0000
@@ -4,8 +4,6 @@
set -o pipefail
set -o nounset
-source <(dpkg-architecture -s)
-
[ -d jdk/test/ ] || tar xf jdk.tar.xz jdk/test/
cleanup() {
@@ -14,13 +12,13 @@
pkill -9 -P $$
}
-trap "exit" INT TERM ERR
-trap "cleanup" EXIT
+for sig in INT QUIT HUP TERM; do trap "cleanup; trap - $sig EXIT; kill -s $sig "'"$$"' "$sig"; done
+trap cleanup EXIT
export HOME="$(pwd)/jdk/test/"
export XAUTHORITY="${HOME}/.Xauthority"
-
export DISPLAY=:10
+
debian/tests/start-xvfb.sh 10 &
sleep 3
=== modified file 'debian/tests/jtdiff-autopkgtest.sh'
--- debian/tests/jtdiff-autopkgtest.sh 2018-12-05 08:04:39 +0000
+++ debian/tests/jtdiff-autopkgtest.sh 2019-03-17 17:29:36 +0000
@@ -12,18 +12,18 @@
exit 1
fi
-source <(dpkg-architecture -s)
+host_arch=${DEB_HOST_ARCH:-$(dpkg --print-architecture)}
export JTREG_HOME=/usr/share/java
-export JT_JAVA="${JT_JAVA:-/usr/lib/jvm/java-8-openjdk-${DEB_HOST_ARCH}}"
+export JT_JAVA="${JT_JAVA:-/usr/lib/jvm/java-8-openjdk-${host_arch}}"
vmname=${VMNAME:-hotspot}
-jt_report_tb="/usr/share/doc/openjdk-8-jdk/test-${DEB_HOST_ARCH}/jtreport-${vmname}.tar.gz"
+jt_report_tb="/usr/share/doc/openjdk-8-jdk/test-${host_arch}/jtreport-${vmname}.tar.gz"
build_report_dir="${AUTOPKGTEST_TMP}/jtreg-test-output/${testsuite}/JTreport"
if [ ! -f "${jt_report_tb}" ]; then
- echo "Unable to compare jtreg results: no build jtreport found for ${vmname}/${DEB_HOST_ARCH}."
+ echo "Unable to compare jtreg results: no build jtreport found for ${vmname}/${host_arch}."
echo "Reason: '${jt_report_tb}' does not exist."
exit 77
fi
=== modified file 'debian/tests/jtreg-autopkgtest.in'
--- debian/tests/jtreg-autopkgtest.in 2018-12-05 08:04:39 +0000
+++ debian/tests/jtreg-autopkgtest.in 2019-03-17 17:29:36 +0000
@@ -9,17 +9,17 @@
exit 1
fi
-source <(dpkg-architecture -s)
+host_arch=${DEB_HOST_ARCH:-$(dpkg --print-architecture)}
export JTREG_HOME=/usr/share/java
-export JT_JAVA="${JT_JAVA:-/usr/lib/jvm/java-8-openjdk-${DEB_HOST_ARCH}}"
+export JT_JAVA="${JT_JAVA:-/usr/lib/jvm/java-8-openjdk-${host_arch}}"
JDK_DIR="${JDK_DIR:-$JT_JAVA}"
jtreg_version="$(dpkg-query -W jtreg | cut -f2)"
# set additional jtreg options
jt_options="${JTREG_OPTIONS:-}"
-if [[ "armel" == *"${DEB_HOST_ARCH}"* ]]; then
+if [[ "armel" == *"${host_arch}"* ]]; then
jt_options+=" -Xmx256M"
fi
if dpkg --compare-versions ${jtreg_version} ge 4.2; then
@@ -33,8 +33,8 @@
fi
# restrict the tests to a few archs (set from debian/rules)
-if ! echo "${DEB_HOST_ARCH}" | grep -E "^($(echo @jtreg_archs@ | tr ' ' '|'))$"; then
- echo "Error: ${DEB_HOST_ARCH} is not on the jtreg_archs list, ignoring it."
+if ! echo "${host_arch}" | grep -E "^($(echo @jtreg_archs@ | tr ' ' '|'))$"; then
+ echo "Error: ${host_arch} is not on the jtreg_archs list, ignoring it."
exit 77
fi
@@ -53,23 +53,23 @@
# kill testsuite processes still hanging
pids="$(jtreg_pids)"
if [ -n "$pids" ]; then
- echo "killing processes..."
+ echo "[$0] killing processes..."
jtreg_processes
kill -1 $pids
sleep 2
pids="$(jtreg_pids)"
if [ -n "$pids" ]; then
- echo "try harder..."
+ echo "[$0] try harder..."
jtreg_processes
kill -9 $pids
sleep 2
fi
else
- echo "nothing to cleanup"
+ echo "[$0] nothing to cleanup"
fi
pids="$(jtreg_pids)"
if [ -n "$pids" ]; then
- echo "leftover processes..."
+ echo "[$0] leftover processes..."
$(jtreg_processes)
fi
}
@@ -79,7 +79,7 @@
jtreg ${jt_options} \
-verbose:summary \
-automatic \
- -retain \
+ -retain:none \
-ignore:quiet \
-agentvm \
-timeout:5 \
=== modified file 'debian/tests/jtreg-autopkgtest.sh'
--- debian/tests/jtreg-autopkgtest.sh 2018-12-05 08:04:39 +0000
+++ debian/tests/jtreg-autopkgtest.sh 2019-03-17 17:29:36 +0000
@@ -9,17 +9,17 @@
exit 1
fi
-source <(dpkg-architecture -s)
+host_arch=${DEB_HOST_ARCH:-$(dpkg --print-architecture)}
export JTREG_HOME=/usr/share/java
-export JT_JAVA="${JT_JAVA:-/usr/lib/jvm/java-8-openjdk-${DEB_HOST_ARCH}}"
+export JT_JAVA="${JT_JAVA:-/usr/lib/jvm/java-8-openjdk-${host_arch}}"
JDK_DIR="${JDK_DIR:-$JT_JAVA}"
jtreg_version="$(dpkg-query -W jtreg | cut -f2)"
# set additional jtreg options
jt_options="${JTREG_OPTIONS:-}"
-if [[ "armel" == *"${DEB_HOST_ARCH}"* ]]; then
+if [[ "armel" == *"${host_arch}"* ]]; then
jt_options+=" -Xmx256M"
fi
if dpkg --compare-versions ${jtreg_version} ge 4.2; then
@@ -33,8 +33,8 @@
fi
# restrict the tests to a few archs (set from debian/rules)
-if ! echo "${DEB_HOST_ARCH}" | grep -E "^($(echo amd64 i386 arm64 ppc64 ppc64el sparc64 armhf kfreebsd-amd64 kfreebsd-i386 alpha arm64 armel armhf ia64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sh4 x32 | tr ' ' '|'))$"; then
- echo "Error: ${DEB_HOST_ARCH} is not on the jtreg_archs list, ignoring it."
+if ! echo "${host_arch}" | grep -E "^($(echo amd64 i386 arm64 ppc64 ppc64el sparc64 armhf kfreebsd-amd64 kfreebsd-i386 alpha arm64 armel armhf ia64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sh4 x32 | tr ' ' '|'))$"; then
+ echo "Error: ${host_arch} is not on the jtreg_archs list, ignoring it."
exit 77
fi
@@ -53,23 +53,23 @@
# kill testsuite processes still hanging
pids="$(jtreg_pids)"
if [ -n "$pids" ]; then
- echo "killing processes..."
+ echo "[$0] killing processes..."
jtreg_processes
kill -1 $pids
sleep 2
pids="$(jtreg_pids)"
if [ -n "$pids" ]; then
- echo "try harder..."
+ echo "[$0] try harder..."
jtreg_processes
kill -9 $pids
sleep 2
fi
else
- echo "nothing to cleanup"
+ echo "[$0] nothing to cleanup"
fi
pids="$(jtreg_pids)"
if [ -n "$pids" ]; then
- echo "leftover processes..."
+ echo "[$0] leftover processes..."
$(jtreg_processes)
fi
}
@@ -79,7 +79,7 @@
jtreg ${jt_options} \
-verbose:summary \
-automatic \
- -retain \
+ -retain:none \
-ignore:quiet \
-agentvm \
-timeout:5 \
__
This is the maintainer address of Debian's Java team
<https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
[email protected] for discussions and questions.
