guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch core-updates updated: gnu: glib: Adhere to '--without-tests' opti


From: guix-commits
Subject: branch core-updates updated: gnu: glib: Adhere to '--without-tests' option.
Date: Sat, 03 Oct 2020 06:55:10 -0400

This is an automated email from the git hooks/post-receive script.

pelzflorian pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 0585a0d  gnu: glib: Adhere to '--without-tests' option.
0585a0d is described below

commit 0585a0d0d1fe6e334d36e2d851b42b47d6769546
Author: Florian Pelz <pelzflorian@pelzflorian.de>
AuthorDate: Sat Oct 3 00:29:56 2020 +0200

    gnu: glib: Adhere to '--without-tests' option.
    
    * gnu/packages/glib.scm (glib)[arguments]<#:phases>[configure]:
    Only run tests if 'tests?' is true.
---
 gnu/packages/glib.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index ca037d3..c703894 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
+;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -325,11 +326,14 @@ shared NFS home directories.")
               (for-each (lambda (x) (apply disable x)) failing-tests)
               #t)))
         (replace 'check
-          (lambda _
-            (setenv "MESON_TESTTHREADS"
-                    (number->string (parallel-job-count)))
-            ;; Do not run tests marked as "flaky".
-            (invoke "meson" "test" "--no-suite" "flaky")))
+          (lambda* (#:key tests? #:allow-other-keys)
+            (if tests?
+                (begin
+                  (setenv "MESON_TESTTHREADS"
+                          (number->string (parallel-job-count)))
+                  ;; Do not run tests marked as "flaky".
+                  (invoke "meson" "test" "--no-suite" "flaky"))
+                #t)))
         ;; TODO: meson does not permit the bindir to be outside of prefix.
         ;; See https://github.com/mesonbuild/meson/issues/2561
         ;; We can remove this once meson is patched.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]