[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: glib: Return #t from all phases.
From: |
Mark H. Weaver |
Subject: |
01/01: gnu: glib: Return #t from all phases. |
Date: |
Sat, 17 Mar 2018 22:47:32 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 81f6bf2d50ec18d2ca5fff198e9068402437b699
Author: Mark H Weaver <address@hidden>
Date: Sat Mar 17 22:28:56 2018 -0400
gnu: glib: Return #t from all phases.
* gnu/packages/glib.scm (glib)[arguments]: In the 'check' phase, use
'for-each' instead to avoid assuming that 'disable' will return a true
value.
Return #t from the 'pre-build' and 'check' phases.
---
gnu/packages/glib.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 6709922..4a5dc12 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -199,7 +199,8 @@ shared NFS home directories.")
"glib/tests/utils.c"
"tests/spawn-test.c")
(("/bin/sh")
- (string-append (assoc-ref inputs "bash") "/bin/sh")))))
+ (string-append (assoc-ref inputs "bash") "/bin/sh")))
+ #t))
(add-before 'check 'disable-failing-tests
(lambda _
(let ((disable
@@ -263,7 +264,8 @@ shared NFS home directories.")
("gio/tests/gdbus-unix-addresses.c"
(;; Requires /etc/machine-id.
"/gdbus/x11-autolaunch")))))
- (and-map (lambda (x) (apply disable x)) failing-tests)))))
+ (for-each (lambda (x) (apply disable x)) failing-tests)
+ #t))))
;; Note: `--docdir' and `--htmldir' are not honored, so work around it.
#:configure-flags (list (string-append "--with-html-dir="