Commits:
-
ac34236b
by Simon McVittie at 2024-11-07T10:43:36+00:00
d/tests: Add an autopkgtest to verify basic functionality of xvfb-run
xvfb-run is frequently used in other packages' automated tests, so any
regressions that affect it are likely to cause numerous test failures.
Having Xvfb's own test fail provides a way to narrow down the reason
for failure.
Reproduces: #1082659, #1084230, #1085704
Signed-off-by: Simon McVittie <smcv@debian.org>
-
234f3ff0
by Simon McVittie at 2024-11-07T10:43:41+00:00
d/rules: Check basic functionality of xvfb-run at build-time
Not all architectures have autopkgtest coverage, so detecting
regressions at build-time is sometimes the best we can do.
Reproduces: #1082659, #1084230, #1085704
Signed-off-by: Simon McVittie <smcv@debian.org>
-
aae333da
by Simon McVittie at 2024-11-07T10:44:10+00:00
d/control, d/rules.flags: Disable libunwind on armhf
libunwind 1.7.x regressed on armhf in a way that causes Xvfb to segfault
during startup, and displaying better backtraces on a crash doesn't seem
like key functionality for Xvfb.
Mitigates: #1082659
Closes: #1084230, #1085704
5 changed files:
Changes:
debian/control
| ... |
... |
@@ -28,7 +28,7 @@ Build-Depends: |
|
28
|
28
|
libdrm-dev (>= 2.4.107-5~) [!hurd-any],
|
|
29
|
29
|
libglvnd-dev,
|
|
30
|
30
|
mesa-common-dev,
|
|
31
|
|
- libunwind-dev [amd64 arm64 armel armhf hppa i386 ia64 mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4],
|
|
|
31
|
+ libunwind-dev [amd64 arm64 armel hppa i386 ia64 mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4],
|
|
32
|
32
|
libxmuu-dev (>= 1:0.99.1),
|
|
33
|
33
|
libxext-dev (>= 1:0.99.1),
|
|
34
|
34
|
libx11-dev (>= 2:1.6),
|
| ... |
... |
@@ -65,7 +65,9 @@ Build-Depends: |
|
65
|
65
|
libxcb-glx0-dev,
|
|
66
|
66
|
libxcb-xf86dri0-dev (>= 1.6),
|
|
67
|
67
|
# unit tests
|
|
|
68
|
+ xauth <!nocheck>,
|
|
68
|
69
|
xkb-data,
|
|
|
70
|
+ x11-utils <!nocheck>,
|
|
69
|
71
|
x11-xkb-utils,
|
|
70
|
72
|
# arc4random_buf(), getpeereid()
|
|
71
|
73
|
libbsd-dev,
|
debian/rules
| ... |
... |
@@ -44,7 +44,11 @@ override_dh_auto_build: |
|
44
|
44
|
dh_auto_build --builddirectory=debian/build/udeb
|
|
45
|
45
|
|
|
46
|
46
|
override_dh_auto_test:
|
|
|
47
|
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
|
|
47
|
48
|
dh_auto_test -- -j1 VERBOSE=1
|
|
|
49
|
+ # Check basic functionality of Xvfb
|
|
|
50
|
+ PATH="debian/build/main/hw/vfb:$$PATH" sh debian/local/xvfb-run -a -e /proc/self/fd/2 -s -noreset xdpyinfo
|
|
|
51
|
+endif
|
|
48
|
52
|
|
|
49
|
53
|
override_dh_auto_install:
|
|
50
|
54
|
dh_auto_install --builddirectory=debian/build/main \
|
debian/rules.flags
| ... |
... |
@@ -128,7 +128,7 @@ else # hurd |
|
128
|
128
|
endif
|
|
129
|
129
|
|
|
130
|
130
|
# some archs don't have libunwind
|
|
131
|
|
-ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf hppa i386 ia64 mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4))
|
|
|
131
|
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel hppa i386 ia64 mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4))
|
|
132
|
132
|
confflags_main += --enable-libunwind
|
|
133
|
133
|
else
|
|
134
|
134
|
confflags_main += --disable-libunwind
|
debian/tests/control
|
|
1
|
+Tests:
|
|
|
2
|
+ xvfb-run,
|
|
|
3
|
+Depends:
|
|
|
4
|
+ x11-utils,
|
|
|
5
|
+ xauth,
|
|
|
6
|
+ xvfb,
|
|
|
7
|
+Restrictions:
|
|
|
8
|
+ allow-stderr,
|
|
|
9
|
+ superficial, |
debian/tests/xvfb-run
|
|
1
|
+#!/bin/sh
|
|
|
2
|
+set -eu
|
|
|
3
|
+
|
|
|
4
|
+xvfb-run -a -e /proc/self/fd/2 -s "-noreset" xdpyinfo |
|