From daf54a3953e807d46c4c21bbc709879c6e8d31e8 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 19 Oct 2021 23:45:52 -0400
Subject: gnu: gawk: Use regular bash to cope with test suite failures.

Fixes <https://issues.guix.gnu.org/51286>.

* gnu/packages/gawk.scm (gawk): Remove trailing #t.
[inputs]: Always use bash.
---
 gnu/packages/gawk.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'gnu/packages/gawk.scm')

diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm
index 6dab274be1..f8f13fc9a3 100644
--- a/gnu/packages/gawk.scm
+++ b/gnu/packages/gawk.scm
@@ -55,9 +55,7 @@
                              '((substitute* "extension/Makefile.in"
                                  (("^.*: check-for-shared-lib-support" match)
                                   (string-append "### " match))))
-                             '())
-
-                       #t)))
+                             '()))))
 
                  (add-before 'check 'adjust-test-infrastructure
                    (lambda _
@@ -80,14 +78,12 @@
                      ;; against the actual test output.
                      (substitute* "test/watchpoint1.ok"
                        (("#! /usr/bin/gawk")
-                        (string-append "#!" (which "gawk"))))
-                     #t)))))
+                        (string-append "#!" (which "gawk")))))))))
 
    (inputs `(("libsigsegv" ,libsigsegv)
-
-             ,@(if (%current-target-system)
-                   `(("bash" ,bash))
-                   '())))
+             ;; Use the full-fledged Bash package, otherwise the test suite
+             ;; sometimes fail non-deterministically.
+             ("bash" ,bash)))
 
    (home-page "https://www.gnu.org/software/gawk/")
    (synopsis "Text scanning and processing language")
-- 
cgit v1.2.3