1 files changed, 19 insertions, 5 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 170faa8020..e2af4d567b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5053,9 +5053,21 @@ indicators etc).")
     (build-system meson-build-system)
     (arguments
      (list
-       ;; TODO: Figure out why some tests SIGABRT on aarch64-linux.
-       #:tests? (and (not (%current-target-system))
-                     (not (target-aarch64?)))))
+      ;; Exclude flaky tests (see https://codeberg.org/guix/guix/issues/1377).
+      ;; Meson cannot exclude individual tests so the test suite is added in the
+      ;; phase below.
+      #:test-options #~(list "--no-suite" "connection")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'mark-tests-for-exclusion
+            (lambda _
+              ;; The test names are programmatically generated in the meson
+              ;; build file. The two failing tests are "connection-gnutls" and
+              ;; "connection-gnutls-tls1.2" and share program[0] == "common",
+              ;; so use that as the suite name.
+              (substitute* "tls/tests/meson.build"
+                (("test\\(([^)]*)\\)" _ args)
+                 (string-append "test(" args ", suite: program[0])"))))))))
     (native-inputs
      (list `(,glib "bin") ; for gio-querymodules
            pkg-config gettext-minimal))
@@ -5104,7 +5116,7 @@ from the GSettings schemas in gsettings-desktop-schemas.")
     (native-inputs
      (list gettext-minimal
            pkg-config
-           cmake
+           cmake-minimal
            `(,glib "bin")
            desktop-file-utils
            itstool
@@ -8415,6 +8427,7 @@ Microsoft Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
     (build-system cmake-build-system)
     (arguments
      (list
+      #:parallel-tests? #f
       #:configure-flags
       #~(let* ((lib (string-append #$output "/lib"))
                (runpaths (map (lambda (s)
@@ -12362,6 +12375,7 @@ generic enough to work for everyone.")
     (build-system cmake-build-system)
     (arguments
      (list
+      #:tests? #f
       #:imported-modules `(,@%cmake-build-system-modules
                            (guix build glib-or-gtk-build-system))
       #:modules '((guix build cmake-build-system)
@@ -14297,7 +14311,7 @@ historical battery usage and related statistics.")
               ;; This is done so we can override.
               (("`set.PREFIX_BIN") "set(QPREFIX_BIN")))))))
     (native-inputs
-     (list cmake pkg-config intltool gettext-minimal))
+     (list cmake-minimal pkg-config intltool gettext-minimal))
     (inputs
      (list glib gtk+ libx11 libsm libxv libxaw libxcb libxkbfile
            shared-mime-info))