ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: dejagnu: Use 'modify-phases' syntax.

Browse source 
* gnu/packages/dejagnu.scm (dejagnu)[arguments]: Use 'modify-phases'
syntax.
This commit is contained in:
Efraim Flashner 2016-10-09 08:51:18 +03:00
parent 539ab1afdd
commit 72d6655c55
No known key found for this signature in database
GPG key ID: F4C1D3917EACEE93
1 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/dejagnu.scm
View file

@ -1,5 +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 Efraim Flashner <efraim@flasher.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -38,8 +39,9 @@ (define-public dejagnu
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("expect" ,expect))) (inputs `(("expect" ,expect)))
(arguments (arguments
'(#:phases (alist-replace '(#:phases
'check (modify-phases %standard-phases
(replace 'check
(lambda _ (lambda _
;; 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
@ -49,9 +51,8 @@ (define-public dejagnu
(if (and (directory-exists? "/dev/pts") (if (and (directory-exists? "/dev/pts")
(directory-exists? "/proc")) (directory-exists? "/proc"))
(begin (begin
;; Provide `runtest' with a log name, otherwise ;; Provide `runtest' with a log name, otherwise it
;; it tries to run `whoami', which fails when in ;; tries to run `whoami', which fails when in a chroot.
;; 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:
@ -60,9 +61,8 @@ (define-public dejagnu
(system "make check < /dev/zero"))) (system "make check < /dev/zero")))
(begin (begin
(display "test suite cannot be run, skipping\n") (display "test suite cannot be run, skipping\n")
#t))) #t))))
(alist-cons-after (add-after 'install 'post-install
'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.
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
@ -71,8 +71,7 @@ (define-public dejagnu
(("^mypath.*$" all) (("^mypath.*$" all)
(string-append all (string-append all
"export PATH=" "export PATH="
expect "/bin:$PATH\n"))))) expect "/bin:$PATH\n")))))))))
%standard-phases))))
(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")