apteryx pushed a commit to branch core-updates-frozen-batched-changes in repository guix.
commit 6f4133285ef9bdb0672e007fa4af7152e341609c Author: Maxim Cournoyer <[email protected]> AuthorDate: Tue Oct 19 23:45:52 2021 -0400 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(-) diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 6dab274..f8f13fc 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")
