GNU bug report logs - #76236
[PATCH gnome-team 0/2] Update Mutter and fix tests

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 76236 in the body.
You can then email your comments to 76236 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH gnome-team 0/2] Update Mutter and fix tests
Date: Wed, 12 Feb 2025 21:14:49 +0100

Hi Guix,

after rebasing gnome-team on master, probably as a result of recent Xorg
updates, mutter tests fail.  This series bumps mutter to the latest
minor version while also fixing the tests.

Cheers

Liliana Marie Prikler (2):
  gnu: mutter: Update to 46.8.
  gnu: mutter: Fix tests.

 gnu/packages/gnome.scm | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)


base-commit: b7091c40af21ed5c4dd694c0702d40e186232aee
-- 
2.48.1

Message #8 received at 76236 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 76236 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 1/2] gnu: mutter: Update to 46.8.
Date: Wed, 12 Feb 2025 21:09:45 +0100

* gnu/packages/gnome.scm (mutter): Update to 46.8.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b7cd7842f3..8bb08ab99d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8080,7 +8080,7 @@ (define-public zenity
 (define-public mutter
   (package
     (name "mutter")
-    (version "46.6")
+    (version "46.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -8088,7 +8088,7 @@ (define-public mutter
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1w6da067gxgwwv8q893zxrh7h429m41xzkl3p71kr3iwljbq8aj5"))))
+                "0qn9w74a3ycz2ms2avld8zwhcyw3gwhnqs6asxkqafzv99a87h7v"))))
     ;; 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
-- 
2.48.1

Message #11 received at 76236 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 76236 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 2/2] gnu: mutter: Fix tests.
Date: Wed, 12 Feb 2025 21:10:01 +0100

* gnu/packages/gnome.scm (mutter)[#:test-options]: Add “--no-suite” options
for “mutter/x11” and “mutter/backends/native”.
[#:phases]<disable-failing-tests>: Disable ‘monitor-unit’ test.
Drop code disabling nonexistent ‘native-headless’ and ‘timeline’ tests.
---
 gnu/packages/gnome.scm | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8bb08ab99d..8237d956c4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8121,7 +8121,9 @@ (define-public mutter
          "-Degl_device=true"            ;false by default
          "-Dwayland_eglstream=true"     ;false by default
          (string-append "-Dudev_dir=" #$output "/lib/udev"))
-      #:test-options '(list "--verbose")
+      #:test-options '(list "--verbose"
+                            "--no-suite" "mutter/x11"
+                            "--no-suite" "mutter/backends/native")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'use-RUNPATH-instead-of-RPATH
@@ -8142,18 +8144,13 @@ (define-public mutter
                       (string-append #$output "/lib/udev"))))
           (add-after 'unpack 'disable-problematic-tests
             (lambda _
-              ;; The native-headless test hangs due to attempting to use audio,
-              ;; unavailable in the container.
-              ;; Note: the following sed expression deletes the whole test(...)
-              ;; expression paragraph.  For an explanation, see: info '(sed)
-              ;; Multiline techniques'.
-              (invoke "sed" "/./{H;$!d} ; x ; s/^.*native-headless.*$//"
+              ;; The monitor-unit test is flaky.
+              ;; Note: the following sed expression deletes the whole test
+              ;; JSON(ish) block.
+              ;; For an explanation, see: info '(sed) Multiline techniques'
+              ;; and info '(sed) Addresses overview'.
+              (invoke "sed" "/}/!{H;$!d} ; x ; s/^.*monitor-unit.*$//"
                       "-i" "src/tests/meson.build")
-              ;; Timeline tests may unexpectedly fail on missed frames, so
-              ;; let's disable them as well.
-              ;; See <https://gitlab.gnome.org/GNOME/mutter/-/issues/2125>
-              (substitute* "src/tests/clutter/conform/meson.build"
-                (("'timeline.*',") ""))
 
               ;; On i686-linux this test fails with a dbus error.  This seems
               ;; to be fine in later versions, so this workaround can probably
-- 
2.48.1

Message #18 received at 76236-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 76236-done <at> debbugs.gnu.org, vivien <at> planete-kraus.eu
Subject: Re: [bug#76236] [PATCH gnome-team 2/2] gnu: mutter: Fix tests.
Date: Sat, 15 Feb 2025 02:01:53 +0900

Hi,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> * gnu/packages/gnome.scm (mutter)[#:test-options]: Add “--no-suite” options
> for “mutter/x11” and “mutter/backends/native”.
> [#:phases]<disable-failing-tests>: Disable ‘monitor-unit’ test.
> Drop code disabling nonexistent ‘native-headless’ and ‘timeline’ tests.

This should be part of the update commit, since otherwise the package is
broken.  I've looked at this and found that by updating our emulation of
upstream's CI setup, only two tests would fail, one could be salvage by
adding a sleep after starting pipewire like what upstream does.  I've
reported these upstream and disabled the one always failing (x11-sync).

Pushed as 1950e9b89e.

-- 
Thanks,
Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.