guix-commits
[Top][All Lists]
Advanced

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

05/66: gnu: dejagnu: Return #t from all phases.


From: Mark H. Weaver
Subject: 05/66: gnu: dejagnu: Return #t from all phases.
Date: Fri, 23 Mar 2018 04:46:38 -0400 (EDT)

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

commit f97cb24967c2787034c3d9a5fce2cf4c1b0c0b3a
Author: Mark H Weaver <address@hidden>
Date:   Fri Mar 23 01:53:23 2018 -0400

    gnu: dejagnu: Return #t from all phases.
    
    * gnu/packages/dejagnu.scm (dejagnu)[arguments]: Return #t from all phases.
    Raise an exception if make check fails.
---
 gnu/packages/dejagnu.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/dejagnu.scm b/gnu/packages/dejagnu.scm
index 05825ba..f2aca50 100644
--- a/gnu/packages/dejagnu.scm
+++ b/gnu/packages/dejagnu.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
+;;; Copyright © 2018 Mark H Weaver <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -57,11 +58,10 @@
 
                   ;; The test-suite needs to have a non-empty stdin:
                   ;; 
<http://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html>.
-                  (zero?
-                   (system "make check < /dev/zero")))
-                 (begin
-                   (display "test suite cannot be run, skipping\n")
-                   #t))))
+                  (unless (zero? (system "make check < /dev/zero"))
+                    (error "make check failed")))
+                 (display "test suite cannot be run, skipping\n"))
+             #t))
          (add-after 'install 'post-install
            (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; Use the right `expect' binary.
@@ -71,7 +71,8 @@
                  (("^mypath.*$" all)
                   (string-append all
                                  "export PATH="
-                                 expect "/bin:$PATH\n")))))))))
+                                 expect "/bin:$PATH\n")))
+               #t))))))
     (home-page
      "https://www.gnu.org/software/dejagnu/";)
     (synopsis "GNU software testing framework")



reply via email to

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