ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-15 07:27:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: dejagnu: Fix test failure.

Browse source 
This is a follow-up to commit 0b65cb03b3.

* gnu/packages/dejagnu.scm (dejagnu)[inputs]: Add BASH-MINIMAL.
[arguments]: Add phase to patch /bin/sh references.
This commit is contained in:
Marius Bakke 2022-06-30 18:52:27 +02:00
parent 4bc6888f5e
commit 0ef3e954de
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/dejagnu.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2022 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>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -23,6 +24,7 @@ (define-module (gnu packages dejagnu)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (gnu packages bash)
#:use-module (gnu packages tcl)) #:use-module (gnu packages tcl))
(define-public dejagnu (define-public dejagnu
@ -38,10 +40,19 @@ (define-public dejagnu
(base32 (base32
"1qx2cv6qkxbiqg87jh217jb62hk3s7dmcs4cz1llm2wmsynfznl7")))) "1qx2cv6qkxbiqg87jh217jb62hk3s7dmcs4cz1llm2wmsynfznl7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list expect)) (inputs (list bash-minimal expect))
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-/bin/sh
(lambda* (#:key inputs #:allow-other-keys)
;; Patch embedded /bin/sh references.
(let ((/bin/sh (search-input-file inputs "/bin/sh")))
(substitute* "dejagnu"
(("exec /bin/sh")
(string-append "exec " /bin/sh)))
(substitute* (find-files "testsuite/report-card.all")
(("/bin/sh") /bin/sh)))))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
;; Note: The test-suite *requires* /dev/pts among the ;; Note: The test-suite *requires* /dev/pts among the