all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / Atom feed
* [bug#48850] [PATCH] gnu: coreutils: Disable inotify-dir-recreate test
@ 2021-06-05 15:26 Carl Dong
  2021-06-05 20:18 ` Ludovic Courtès
  0 siblings, 1 reply; 5+ messages in thread
From: Carl Dong @ 2021-06-05 15:26 UTC (permalink / raw)
  To: 48850; +Cc: Carl Dong

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





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#48850] [PATCH] gnu: coreutils: Disable inotify-dir-recreate test
  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   ` [bug#48850] [PATCH v2] " Carl Dong
  0 siblings, 1 reply; 5+ messages in thread
From: Ludovic Courtès @ 2021-06-05 20:18 UTC (permalink / raw)
  To: Carl Dong; +Cc: 48850

Hi,

Carl Dong <contact@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’.




^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#48850] [PATCH v2] gnu: coreutils: Disable inotify-dir-recreate test
  2021-06-05 20:18 ` Ludovic Courtès
@ 2021-06-07 21:50   ` Carl Dong
  2021-06-08 18:38     ` [bug#48850] [PATCH v3] " Carl Dong
  0 siblings, 1 reply; 5+ messages in thread
From: Carl Dong @ 2021-06-07 21:50 UTC (permalink / raw)
  To: ludo; +Cc: 48850, Carl Dong

[-- 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





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#48850] [PATCH v3] gnu: coreutils: Disable inotify-dir-recreate test
  2021-06-07 21:50   ` [bug#48850] [PATCH v2] " Carl Dong
@ 2021-06-08 18:38     ` Carl Dong
  2021-06-11 13:56       ` Ludovic Courtès
  0 siblings, 1 reply; 5+ messages in thread
From: Carl Dong @ 2021-06-08 18:38 UTC (permalink / raw)
  To: ludo; +Cc: 48850, Carl Dong

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





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#48850] [PATCH v3] gnu: coreutils: Disable inotify-dir-recreate test
  2021-06-08 18:38     ` [bug#48850] [PATCH v3] " Carl Dong
@ 2021-06-11 13:56       ` Ludovic Courtès
  0 siblings, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2021-06-11 13:56 UTC (permalink / raw)
  To: Carl Dong; +Cc: 48850

Hi Carl,

Carl Dong <contact@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’.




^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-06-11 13:57 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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   ` [bug#48850] [PATCH v2] " Carl Dong
2021-06-08 18:38     ` [bug#48850] [PATCH v3] " Carl Dong
2021-06-11 13:56       ` Ludovic Courtès

all messages for Guix-related lists mirrored at yhetil.org

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix

Example config snippet for mirrors.


AGPL code for this site: git clone http://ou63pmih66umazou.onion/public-inbox.git