Dylan Aïssi pushed to branch debian-unstable at X Strike Force / wayland / weston
Commits: 904c821d by Dylan Aïssi at 2024-02-26T17:52:34+01:00 Retrict architectures where tests are run Tests are known to fail on some architectures https://gitlab.freedesktop.org/wayland/weston/-/issues/739 Signed-off-by: Dylan Aïssi <[email protected]> - - - - - 87c0919b by Dylan Aïssi at 2024-02-26T17:52:53+01:00 Disable backend-rdp for i64 and backend-vnc for i64 and sparc64 freerdp2-dev and libneatvnc-dev are not installable in an enough recent version. Signed-off-by: Dylan Aïssi <[email protected]> - - - - - ea2cb803 by Dylan Aïssi at 2024-02-26T17:56:03+01:00 Mark Skip_xwayland_test.patch as 'Forwarded: not-needed' Signed-off-by: Dylan Aïssi <[email protected]> - - - - - 4dd376e8 by Dylan Aïssi at 2024-02-26T18:12:22+01:00 Switch from pkg-config to pkgconf Signed-off-by: Dylan Aïssi <[email protected]> - - - - - dea6a083 by Dylan Aïssi at 2024-02-26T18:12:22+01:00 Release weston version 13.0.0-3 Signed-off-by: Dylan Aïssi <[email protected]> - - - - - 5 changed files: - debian/changelog - debian/control - debian/patches/Skip_xwayland_test.patch - debian/rules - debian/tests/control Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +weston (13.0.0-3) unstable; urgency=medium + + * Retrict architectures where tests are run + * Disable backend-rdp for i64 and backend-vnc for i64 and sparc64, + because of Build-Deps not available. + * Mark Skip_xwayland_test.patch as 'Forwarded: not-needed' + * Switch from pkg-config to pkgconf + + -- Dylan Aïssi <[email protected]> Mon, 26 Feb 2024 18:02:10 +0100 + weston (13.0.0-2) unstable; urgency=medium * Mark libweston-13-dev as 'Multi-Arch: same' ===================================== debian/control ===================================== @@ -7,7 +7,7 @@ Uploaders: Mike Gabriel <[email protected]>, Emilio Pozuelo Monfort <[email protected]>, Dylan Aïssi <[email protected]> Build-Depends: debhelper-compat (= 13), - freerdp2-dev, + freerdp2-dev [!ia64], libcairo2-dev (>= 1.10.0), libcolord-dev (>= 0.1.27), libdbus-1-dev, @@ -48,7 +48,7 @@ Build-Depends: debhelper-compat (= 13), libxml2-dev, mesa-common-dev, meson (>= 0.63.0), - pkg-config, + pkgconf, wayland-protocols (>= 1.31) Standards-Version: 4.6.2 Rules-Requires-Root: no ===================================== debian/patches/Skip_xwayland_test.patch ===================================== @@ -2,6 +2,7 @@ Description: Skip the xwayland test because it doesn't work on Debian at build time, nor on the autopkgtest infrastructure. It fails with: > failed to bind to /tmp/.X11-unix/X0: No such file or directory Author: Dylan Aïssi <[email protected]> +Forwarded: not-needed --- a/tests/xwayland-test.c +++ b/tests/xwayland-test.c ===================================== debian/rules ===================================== @@ -2,13 +2,34 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all +ifneq (,$(filter i64,$(DEB_HOST_ARCH))) +BACKEND_RDP=false +else +BACKEND_RDP=true +endif + +ifneq (,$(filter i64 sparc64,$(DEB_HOST_ARCH))) +BACKEND_VNC=false +else +BACKEND_VNC=true +endif + override_dh_auto_configure: - dh_auto_configure -- -Dscreenshare=true \ + dh_auto_configure -- \ + -Dbackend-rdp=$(BACKEND_RDP) \ + -Dbackend-vnc=$(BACKEND_VNC) \ + -Dscreenshare=true \ -Dsystemd=true override_dh_auto_test: mkdir -p $(CURDIR)/debian/tmp/tmp/xdgruntimedir +# Only make tests fatal for a subset of architectures +# https://gitlab.freedesktop.org/wayland/weston/-/issues/739 +ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel i386 ppc64el)) XDG_RUNTIME_DIR=$(CURDIR)/debian/tmp/tmp/xdgruntimedir dh_auto_test +else + XDG_RUNTIME_DIR=$(CURDIR)/debian/tmp/tmp/xdgruntimedir -dh_auto_test +endif override_dh_missing: dh_missing --fail-missing -X.la ===================================== debian/tests/control ===================================== @@ -3,3 +3,6 @@ Test-Command: dh_auto_configure; dh_auto_build; dh_auto_test Depends: @builddeps@ Restrictions: allow-stderr +Architecture: amd64 arm64 armel i386 ppc64el +# Tests fail on some Architectures +# https://gitlab.freedesktop.org/wayland/weston/-/issues/739 View it on GitLab: https://salsa.debian.org/xorg-team/wayland/weston/-/compare/389c3f7eba31ba7b37bfc861199d4bfc66684128...dea6a083bc1f4c1306d0eac21ca11a3ecbcc497b -- View it on GitLab: https://salsa.debian.org/xorg-team/wayland/weston/-/compare/389c3f7eba31ba7b37bfc861199d4bfc66684128...dea6a083bc1f4c1306d0eac21ca11a3ecbcc497b You're receiving this email because of your account on salsa.debian.org.
