Julien Cristau pushed to branch debian-unstable at X Strike Force / xserver / xorg-server
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 <[email protected]> - - - - - 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 <[email protected]> - - - - - 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: - debian/control - debian/rules - debian/rules.flags - + debian/tests/control - + debian/tests/xvfb-run Changes: ===================================== debian/control ===================================== @@ -28,7 +28,7 @@ Build-Depends: libdrm-dev (>= 2.4.107-5~) [!hurd-any], libglvnd-dev, mesa-common-dev, - libunwind-dev [amd64 arm64 armel armhf hppa i386 ia64 mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4], + libunwind-dev [amd64 arm64 armel hppa i386 ia64 mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4], libxmuu-dev (>= 1:0.99.1), libxext-dev (>= 1:0.99.1), libx11-dev (>= 2:1.6), @@ -65,7 +65,9 @@ Build-Depends: libxcb-glx0-dev, libxcb-xf86dri0-dev (>= 1.6), # unit tests + xauth <!nocheck>, xkb-data, + x11-utils <!nocheck>, x11-xkb-utils, # arc4random_buf(), getpeereid() libbsd-dev, ===================================== debian/rules ===================================== @@ -44,7 +44,11 @@ override_dh_auto_build: dh_auto_build --builddirectory=debian/build/udeb override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) dh_auto_test -- -j1 VERBOSE=1 + # Check basic functionality of Xvfb + PATH="debian/build/main/hw/vfb:$$PATH" sh debian/local/xvfb-run -a -e /proc/self/fd/2 -s -noreset xdpyinfo +endif override_dh_auto_install: dh_auto_install --builddirectory=debian/build/main \ ===================================== debian/rules.flags ===================================== @@ -128,7 +128,7 @@ else # hurd endif # some archs don't have libunwind -ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf hppa i386 ia64 mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4)) +ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel hppa i386 ia64 mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4)) confflags_main += --enable-libunwind else confflags_main += --disable-libunwind ===================================== debian/tests/control ===================================== @@ -0,0 +1,9 @@ +Tests: + xvfb-run, +Depends: + x11-utils, + xauth, + xvfb, +Restrictions: + allow-stderr, + superficial, ===================================== debian/tests/xvfb-run ===================================== @@ -0,0 +1,4 @@ +#!/bin/sh +set -eu + +xvfb-run -a -e /proc/self/fd/2 -s "-noreset" xdpyinfo View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/-/compare/1273445c1249e31beaa4e112d3f4b1b3dee76ab3...aae333dae6df742b44c2176eb05e3aec91eff803 -- View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/-/compare/1273445c1249e31beaa4e112d3f4b1b3dee76ab3...aae333dae6df742b44c2176eb05e3aec91eff803 You're receiving this email because of your account on salsa.debian.org.
