guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

38/84: gnu: coreutils: Skip hanging and failing test for the Hurd.


From: guix-commits
Subject: 38/84: gnu: coreutils: Skip hanging and failing test for the Hurd.
Date: Wed, 14 Jun 2023 06:23:57 -0400 (EDT)

janneke pushed a commit to branch wip-hurd
in repository guix.

commit 681a2a8287496dd4b9cf0f9ffb14f62f1c9743fb
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
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/ls-misc.pl", "tests/misc/shred-passes.sh",
    "tests/misc/pwd-long.sh", "tests/misc/stat-slash.sh",
    "tests/misc/wc-parallel.sh", "tests/rm/fail-eperm.xpl",
    "tests/split/filter.sh", and "tests/tail-2/wait.sh".
---
 gnu/packages/base.scm | 47 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 00cb88c39b..422bd94163 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016, 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -400,21 +400,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")))
@@ -437,9 +427,36 @@ 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/ls-misc.pl"
+                                   "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/rm/fail-eperm.xpl"
+                                   "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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]