From 0ef3e954def16c64f68383b6200e565aacf5b579 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Jun 2022 18:52:27 +0200 Subject: [PATCH] gnu: dejagnu: Fix test failure. This is a follow-up to commit 0b65cb03b3ce04e0f0f1ad9e2eb7bfeff7f42b8e. * gnu/packages/dejagnu.scm (dejagnu)[inputs]: Add BASH-MINIMAL. [arguments]: Add phase to patch /bin/sh references. --- gnu/packages/dejagnu.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/dejagnu.scm b/gnu/packages/dejagnu.scm index b97df79f4d..59f8bd41c2 100644 --- a/gnu/packages/dejagnu.scm +++ b/gnu/packages/dejagnu.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013 Ludovic Courtès ;;; Copyright © 2016, 2017, 2022 Efraim Flashner ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2022 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix licenses) + #:use-module (gnu packages bash) #:use-module (gnu packages tcl)) (define-public dejagnu @@ -38,10 +40,19 @@ (base32 "1qx2cv6qkxbiqg87jh217jb62hk3s7dmcs4cz1llm2wmsynfznl7")))) (build-system gnu-build-system) - (inputs (list expect)) + (inputs (list bash-minimal expect)) (arguments '(#: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 (lambda* (#:key tests? #:allow-other-keys) ;; Note: The test-suite *requires* /dev/pts among the