me
/
guix
Archived
1
0
Fork 0
Code

gnu: dejagnu: Honor tests? flag. 

* gnu/packages/dejagnu.scm (dejagnu)[arguments]: Adjust custom 'check
phase to honor the #:tests? flag.
master
Efraim Flashner 2022-01-24 09:17:35 +02:00
parent e25ff31663
commit 1236a563b9
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnu/packages/dejagnu.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flasher.co.il> ;;; Copyright © 2016, 2017, 2022 Efraim Flashner <efraim@flasher.co.il>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -43,25 +43,25 @@
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda* (#:key tests? #:allow-other-keys)
;; Note: The test-suite *requires* /dev/pts among the ;; Note: The test-suite *requires* /dev/pts among the
;; `build-chroot-dirs' of the build daemon when ;; `build-chroot-dirs' of the build daemon when
;; building in a chroot. See ;; building in a chroot. See
;; <http://thread.gmane.org/gmane.linux.distributions.nixos/1036> ;; <http://thread.gmane.org/gmane.linux.distributions.nixos/1036>
;; for details. ;; for details.
(if (and (directory-exists? "/dev/pts") (when tests?
(directory-exists? "/proc")) (if (and (directory-exists? "/dev/pts")
(directory-exists? "/proc"))
(begin (begin
;; Provide `runtest' with a log name, otherwise it ;; Provide `runtest' with a log name, otherwise it
;; tries to run `whoami', which fails when in a chroot. ;; tries to run `whoami', which fails when in a chroot.
(setenv "LOGNAME" "guix-builder") (setenv "LOGNAME" "guix-builder")
;; The test-suite needs to have a non-empty stdin: ;; The test-suite needs to have a non-empty stdin:
;; <http://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html>. ;; <http://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html>.
(unless (zero? (system "make check < /dev/zero")) (unless (zero? (system "make check < /dev/zero"))
(error "make check failed"))) (error "make check failed")))
(display "test suite cannot be run, skipping\n")) (display "test suite cannot be run, skipping\n")))))
#t))
(add-after 'install 'post-install (add-after 'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Use the right `expect' binary. ;; Use the right `expect' binary.
@ -71,8 +71,7 @@
(("^mypath.*$" all) (("^mypath.*$" all)
(string-append all (string-append all
"export PATH=" "export PATH="
expect "/bin:$PATH\n"))) expect "/bin:$PATH\n")))))))))
#t))))))
(home-page (home-page
"https://www.gnu.org/software/dejagnu/") "https://www.gnu.org/software/dejagnu/")
(synopsis "GNU software testing framework") (synopsis "GNU software testing framework")