unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Carl Dong <contact@carldong.me>
To: ludo@gnu.org
Cc: 48850@debbugs.gnu.org, Carl Dong <contact@carldong.me>
Subject: [bug#48850] [PATCH v2] gnu: coreutils: Disable inotify-dir-recreate test
Date: Mon,  7 Jun 2021 17:50:59 -0400	[thread overview]
Message-ID: <20210607215058.3989424-1-contact@carldong.me> (raw)
In-Reply-To: <878s3onjzl.fsf@gnu.org>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2114 bytes --]

> I’d write it like this:
> 
>  (lambda _
>    ,@(if (hurd-target?)
>          '((substitute* …))
>          '())
> 
>    …)

I'm not entirely familiar with the quoting here, but I trust that this is
correct... Does the following patch look okay?

---

This test fails on filesystems where tail detects that it cannot use
inotify safely. See https://issues.guix.gnu.org/47935 for more details.

* gnu/packages/base.scm (coreutils)[phases]: Disable
  inotify-dir-recreate tests.
---
 gnu/packages/base.scm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index d30299a7b6..1ab50dfaf9 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -378,13 +378,17 @@ used to apply commands with arbitrarily long arguments.")
                        (("/bin/sh") (which "sh")))
                      (substitute* (find-files "tests" "\\.sh$")
                        (("#!/bin/sh") (string-append "#!" (which "sh"))))))
-                 ,@(if (hurd-target?)
-                       `((add-after 'unpack 'remove-tests
-                           (lambda _
-                             (substitute* "Makefile.in"
-                               ;; this test hangs
-                               (("^ *tests/misc/timeout-group.sh.*") "")))))
-                       '()))))
+                 (add-after 'unpack 'remove-tests
+                   (lambda _
+                     ,@(if (hurd-target?)
+                         '(substitute* "Makefile.in"
+                           ;; this test hangs
+                            (("^ *tests/misc/timeout-group.sh.*") ""))
+                         '())
+                     (substitute* "Makefile.in"
+                       ;; fails on filesystems where inotify cannot be used,
+                       ;; more info in #47935
+                       (("^ *tests/tail-2/inotify-dir-recreate.sh.*") "")))))))
    (synopsis "Core GNU utilities (file, text, shell)")
    (description
     "GNU Coreutils package includes all of the basic command-line tools that
-- 
2.31.1





  reply	other threads:[~2021-06-07 21:53 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-05 15:26 [bug#48850] [PATCH] gnu: coreutils: Disable inotify-dir-recreate test Carl Dong
2021-06-05 20:18 ` Ludovic Courtès
2021-06-07 21:50   ` Carl Dong [this message]
2021-06-08 18:38     ` [bug#48850] [PATCH v3] " Carl Dong
2021-06-11 13:56       ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210607215058.3989424-1-contact@carldong.me \
    --to=contact@carldong.me \
    --cc=48850@debbugs.gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).