GNU bug report logs - #48850
[PATCH] gnu: coreutils: Disable inotify-dir-recreate test

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 48850 in the body.
You can then email your comments to 48850 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Carl Dong <contact <at> carldong.me>
To: guix-patches <at> gnu.org
Cc: Carl Dong <contact <at> carldong.me>
Subject: [PATCH] gnu: coreutils: Disable inotify-dir-recreate test
Date: Sat,  5 Jun 2021 11:26:45 -0400

This test fails on filesystems where tail detects that it cannot use
inotify safely. See #47935 for more details.

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

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index d30299a7b6..02ac619fac 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -378,13 +378,16 @@ 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

Message #8 received at 48850 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Carl Dong <contact <at> carldong.me>
Cc: 48850 <at> debbugs.gnu.org
Subject: Re: bug#48850: [PATCH] gnu: coreutils: Disable inotify-dir-recreate
 test
Date: Sat, 05 Jun 2021 22:18:22 +0200

Hi,

Carl Dong <contact <at> carldong.me> skribis:

> This test fails on filesystems where tail detects that it cannot use
> inotify safely. See #47935 for more details.
>
> * gnu/packages/base.scm (coreutils)[phases]: Disable
>   inotify-dir-recreate tests.

Please write the full bug URL in the commit log and comment; it’s less
ambiguous, more future-proof, and more convenient.

> -                 ,@(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.*") "")))

I’d write it like this:

  (lambda _
    ,@(if (hurd-target?)
          '((substitute* …))
          '())

    …)

That way, the Hurd bit is only expanded when targeting the Hurd, and we
can also adjust it without causing rebuilds on GNU/Linux.

As far as I’m concerned, it’s OK for ‘core-updates’ with these changes!

Thanks,
Ludo’.

Message #11 received at 48850 <at> debbugs.gnu.org (full text, mbox):

From: Carl Dong <contact <at> carldong.me>
To: ludo <at> gnu.org
Cc: 48850 <at> debbugs.gnu.org, Carl Dong <contact <at> carldong.me>
Subject: [PATCH v2] gnu: coreutils: Disable inotify-dir-recreate test
Date: Mon,  7 Jun 2021 17:50:59 -0400

> 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

Message #14 received at 48850 <at> debbugs.gnu.org (full text, mbox):

From: Carl Dong <contact <at> carldong.me>
To: ludo <at> gnu.org
Cc: 48850 <at> debbugs.gnu.org, Carl Dong <contact <at> carldong.me>
Subject: [PATCH v3] gnu: coreutils: Disable inotify-dir-recreate test
Date: Tue,  8 Jun 2021 14:38:15 -0400

Fixed my quoting thanks to mbakke :-)

---

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, quote Hurd substitute* call to reduce
  rebuilds.
---
 gnu/packages/base.scm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index d30299a7b6..edc4c4a427 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"
+                 (add-after 'unpack 'remove-tests
+                   (lambda _
+                     ,@(if (hurd-target?)
+                           '((substitute* "Makefile.in"
                                ;; this test hangs
-                               (("^ *tests/misc/timeout-group.sh.*") "")))))
-                       '()))))
+                               (("^ *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

Message #17 received at 48850 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Carl Dong <contact <at> carldong.me>
Cc: 48850 <at> debbugs.gnu.org
Subject: Re: [PATCH v3] gnu: coreutils: Disable inotify-dir-recreate test
Date: Fri, 11 Jun 2021 15:56:40 +0200

Hi Carl,

Carl Dong <contact <at> carldong.me> skribis:

> Fixed my quoting thanks to mbakke :-)
>
> ---
>
> 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, quote Hurd substitute* call to reduce
>   rebuilds.

LGTM and OK for ‘core-updates’, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.