guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit e888b21bd9a2f15d9f65cc666f323ff4fe6e15f5
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Sun Apr 5 14:21:42 2026 +0900
gnu: mutter: Skip wayland-unit flaky test.
* gnu/packages/gnome.scm (mutter): Apply patch.
* gnu/packages/patches/mutter-disable-flaky-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Change-Id: I05f37d719dbdc659342d108a4af805125fb015db
Signed-off-by: Noé Lopez <[email protected]>
---
gnu/local.mk | 1 +
gnu/packages/gnome.scm | 3 +-
.../patches/mutter-disable-flaky-tests.patch | 81 ++++++++++++++++++++++
3 files changed, 84 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 98fb7fd97e..ecffd2d2b4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2000,6 +2000,7 @@ dist_patch_DATA =
\
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/musl-CVE-2026-40200.patch \
%D%/packages/patches/mutt-store-references.patch \
+ %D%/packages/patches/mutter-disable-flaky-tests.patch \
%D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch
\
%D%/packages/patches/nanosvg-prusa-slicer.patch \
%D%/packages/patches/nautilus-extension-search-path.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a0cdd62887..1989c7e60a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8188,7 +8188,8 @@ to display dialog boxes from the commandline and shell
scripts.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0mbq7pijx29bp0b8nfy6057z6anc5ff973dqbki0nlv10p2nwrn1"))))
+ "0mbq7pijx29bp0b8nfy6057z6anc5ff973dqbki0nlv10p2nwrn1"))
+ (patches (search-patches "mutter-disable-flaky-tests.patch"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are
diff --git a/gnu/packages/patches/mutter-disable-flaky-tests.patch
b/gnu/packages/patches/mutter-disable-flaky-tests.patch
new file mode 100644
index 0000000000..abc87f6b53
--- /dev/null
+++ b/gnu/packages/patches/mutter-disable-flaky-tests.patch
@@ -0,0 +1,81 @@
+The wayland-unit test is flaky (see:
<https://gitlab.gnome.org/GNOME/mutter/-/issues/4711>).
+
+When disabling the wayland-unit test, the wayland-keyboard test fail to build:
+
+../mutter-49.4/src/tests/wayland-keyboard-tests.c:39:10: fatal error:
dummy-client-protocol.h: No such file or directory
+ 39 | #include "dummy-client-protocol.h"
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~
+
+so disable it as well.
+
+diff --git a/src/tests/meson.build b/src/tests/meson.build
+index 8c3773033f..cd259c8c52 100644
+--- a/src/tests/meson.build
++++ b/src/tests/meson.build
+@@ -914,17 +914,6 @@ wayland_test_cases = [
+ test_client_executables.get('drm-lease'),
+ ],
+ },
+- {
+- 'name': 'wayland-keyboard',
+- 'suite': 'wayland',
+- 'sources': [
+- 'wayland-keyboard-tests.c',
+- wayland_test_utils,
+- ],
+- 'depends': [
+- test_client_executables.get('keyboard'),
+- ],
+- },
+ {
+ 'name': 'wayland-fullscreen',
+ 'suite': 'wayland',
+@@ -966,48 +955,6 @@ wayland_test_cases = [
+ test_client_executables.get('buffer-less-viewport-client'),
+ ],
+ },
+- {
+- 'name': 'wayland-unit',
+- 'suite': 'wayland',
+- 'timeout': 300,
+- 'sources': [
+- 'wayland-unit-tests.c',
+- dummy_client_header,
+- dummy_server_header,
+- dummy_protocol_code,
+- wayland_test_utils,
+- ],
+- 'depends': [
+- test_client,
+- test_client_executables.get('buffer-transform'),
+- test_client_executables.get('cursor-shape'),
+- test_client_executables.get('dma-buf-scanout'),
+- test_client_executables.get('fractional-scale'),
+- test_client_executables.get('fullscreen'),
+- test_client_executables.get('idle-inhibit'),
+- test_client_executables.get('invalid-size-limits-on-map-client'),
+- test_client_executables.get('invalid-subsurfaces'),
+- test_client_executables.get('invalid-xdg-shell-actions'),
+- test_client_executables.get('invalid-geometry'),
+- test_client_executables.get('kms-cursor-hotplug-helper'),
+- test_client_executables.get('service-client'),
+- test_client_executables.get('shm-destroy-before-release'),
+- test_client_executables.get('single-pixel-buffer'),
+- test_client_executables.get('subsurface-corner-cases'),
+- test_client_executables.get('subsurface-parent-unmapped'),
+- test_client_executables.get('subsurface-remap-toplevel'),
+- test_client_executables.get('subsurface-reparenting'),
+- test_client_executables.get('xdg-activation'),
+- test_client_executables.get('xdg-activation-before-mapped'),
+- test_client_executables.get('xdg-apply-limits'),
+- test_client_executables.get('xdg-foreign'),
+- test_client_executables.get('xdg-toplevel-bounds'),
+- test_client_executables.get('xdg-session-management'),
+- test_client_executables.get('xdg-session-management-replace'),
+- test_client_executables.get('xdg-toplevel-tag'),
+- test_client_executables.get('ycbcr'),
+- ],
+- },
+ ]
+
+ test_cases += wayland_test_cases
