diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2023-06-02 16:47:36 +0200 |
|---|---|---|
| committer | Janneke Nieuwenhuizen <janneke@gnu.org> | 2023-07-20 10:11:32 +0200 |
| commit | bc8c6e23683d82b5d3bba49d488356478683ffc3 (patch) | |
| tree | 69ee62f49c95cbf7239fcfb758c5d7d90d7a86a4 /gnu/packages/base.scm | |
| parent | 3cc72873d350da37576a68a46870c0ae3ed67cb4 (diff) | |
| download | guix-patches-bc8c6e23683d82b5d3bba49d488356478683ffc3.tar guix-patches-bc8c6e23683d82b5d3bba49d488356478683ffc3.tar.gz | |
gnu: findutils: Move test-strerror_r from XFAIL to skip on the Hurd.
* gnu/packages/base.scm (findutils)[arguments]: When building natively on the
Hurd, remove #:make-flags as "test-strerror_r" fails non-deterministically.
Instead, add 'skip-test' phase and skip it.
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 00e59e6f46..14479c4951 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -340,10 +340,16 @@ interactive means to merge two files.") (substitute* '("tests/xargs/verbose-quote.sh" "tests/find/exec-plus-last-file.sh") (("#!/bin/sh") - (string-append "#!" (which "sh"))))))) - #:make-flags ,(if (target-hurd?) - ''("XFAIL_TESTS=test-strerror_r") - ''()))) + (string-append "#!" (which "sh")))))) + ,@(if (system-hurd?) + '((add-after 'unpack 'skip-tests + (lambda _ + (substitute* + ;; This test fails non-deterministically + "gnulib-tests/test-strerror_r.c" + (("(^| )main *\\(.*" all) + (string-append all "{\n exit (77);//")))))) + '())))) (synopsis "Operating on files matching given criteria") (description "Findutils supplies the basic file directory searching utilities of the |