From f97cb24967c2787034c3d9a5fce2cf4c1b0c0b3a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Mar 2018 01:53:23 -0400 Subject: 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(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dejagnu.scm b/gnu/packages/dejagnu.scm index 05825bad8f..f2aca50f1a 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 ;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2018 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,11 +58,10 @@ (define-public dejagnu ;; The test-suite needs to have a non-empty stdin: ;; . - (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 @@ (define-public dejagnu (("^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") -- cgit v1.2.3