janneke pushed a commit to branch wip-hurd
in repository guix.
commit 19628111ad76e6022f99d7e0a79c80eb1c6cd32d
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Fri Jun 2 16:47:36 2023 +0200
gnu: findutils: Move test-strerror_r from XFAIL to skip for the Hurd.
* gnu/packages/base.scm (findutils)[arguments]: When building for the Hurd,
remove #:make-flags as "test-strerror_r" fails non-deterministically.
Instead, add 'skip-test' phase and skip it.
---
gnu/packages/base.scm | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index e7bfa9e6ef..1604fb94a8 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -339,10 +339,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 (hurd-target?)
- ''("XFAIL_TESTS=test-strerror_r")
- ''())))
+ (string-append "#!" (which "sh"))))))
+ ,@(if (hurd-target?)
+ '((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
