janneke pushed a commit to branch wip-hurd
in repository guix.
commit 08cfb860c752f48e173c93de40dab99a1b92614f
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Wed May 31 17:51:30 2023 +0200
gnu: coreutils: Skip hanging and failing test for the Hurd.
* gnu/packages/base.scm (coreutils)[arguments]: When building for the Hurd,
remove "test/df/unreadable.sh" and "test-perror2" from #:make-flags's
XFAIL_TESTS as they now pass. Move failing script tests from XFAIL_TESTS to
'remove-tests' phase. In phase 'remove-tests' rewrite substitute* to skip
tests instead of removing them. Add two extra hanging tests,
"tests/cp/sparse-to-pipe.sh", and "tests/split/fail.sh", remove already
skipped by upstream "tests/misc/timeout-group.sh", and add 17 new failing
tests, "tests/cp/special-f.sh", "tests/cp/sparse.sh", "tests/dd/bytes.sh",
"tests/dd/nocache.sh", "tests/dd/stats.sh", "tests/ls/selinux-segfault.sh",
"tests/ls/dangle.sh", "tests/ls/follow-slink.sh", "tests/ls/hyperlink.sh",
"tests/ls/infloop.sh", "tests/ls/inode.sh", "tests/misc/factor-parallel.sh",
"tests/misc/shred-passes.sh", "tests/misc/pwd-long.sh",
"tests/misc/stat-slash.sh", "tests/misc/wc-parallel.sh",
"tests/split/filter.sh", and "tests/tail-2/wait.sh".
---
gnu/packages/base.scm | 45 ++++++++++++++++++++++++++++++---------------
1 file changed, 30 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 59c9632551..dc0f53c59b 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2014 Alex Kost <[email protected]>
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <[email protected]>
;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <[email protected]>
-;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <[email protected]>
+;;; Copyright © 2016, 2020, 2023 Janneke Nieuwenhuizen <[email protected]>
;;; Copyright © 2016, 2018 Alex Vong <[email protected]>
;;; Copyright © 2017 Rene Saavedra <[email protected]>
;;; Copyright © 2017, 2020 Mathieu Othacehe <[email protected]>
@@ -398,21 +398,11 @@ used to apply commands with arbitrarily long arguments.")
`(#:parallel-build? #f ; help2man may be called too early
,@(if (hurd-target?)
'(#:make-flags ; these tests fail deterministically
- (list (string-append "XFAIL_TESTS=tests/misc/env-S.pl"
- " tests/misc/kill.sh"
- " tests/misc/nice.sh"
- " tests/misc/pwd-long.sh"
- " tests/split/fail.sh"
-
- ;; /hurd/fifo issue:
- ;; <https://issues.guix.gnu.org/58803>.
- " tests/df/unreadable.sh"
-
+ (list (string-append "XFAIL_TESTS="
;; Gnulib tests.
" test-fdutimensat"
" test-futimens"
" test-linkat"
- " test-perror2"
" test-renameat"
" test-renameatu"
" test-utimensat")))
@@ -435,9 +425,34 @@ used to apply commands with arbitrarily long arguments.")
(add-after 'unpack 'remove-tests
(lambda _
,@(if (hurd-target?)
- '((substitute* "Makefile.in"
- ;; this test hangs
- (("^ *tests/misc/timeout-group.sh.*") ""))
+ '((substitute*
+ ;; These tests hang
+ '("tests/cp/sparse-to-pipe.sh"
+ "tests/split/fail.sh"
+ ;; These tests fail
+ "tests/cp/sparse.sh"
+ "tests/cp/special-f.sh"
+ "tests/dd/bytes.sh"
+ "tests/dd/nocache.sh"
+ "tests/dd/stats.sh"
+ "tests/ls/dangle.sh"
+ "tests/ls/follow-slink.sh"
+ "tests/ls/hyperlink.sh"
+ "tests/ls/infloop.sh"
+ "tests/ls/inode.sh"
+ "tests/ls/selinux-segfault.sh"
+ "tests/misc/env-S.pl"
+ "tests/misc/factor-parallel.sh"
+ "tests/misc/kill.sh"
+ "tests/misc/nice.sh"
+ "tests/misc/pwd-long.sh"
+ "tests/misc/shred-passes.sh"
+ "tests/misc/stat-slash.sh"
+ "tests/misc/wc-parallel.sh"
+ "tests/split/filter.sh"
+ "tests/tail-2/wait.sh")
+ (("^#!.*" all)
+ (string-append all "exit 77;\n")))
(substitute* "gnulib-tests/Makefile.in"
;; This test sometimes fails and sometimes
;; passes, but it does this consistently, so
