GNU bug report logs - #50664
[PATCH core-updates-frozen] gnu: curl: Respect #:tests?.

Previous Next

Package: guix-patches;

Reported by: Sarah Morgensen <iskarian <at> mgsn.dev>

Date: Sat, 18 Sep 2021 17:15:02 UTC

Severity: normal

Tags: patch

Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#50664; Package guix-patches. (Sat, 18 Sep 2021 17:15:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Sarah Morgensen <iskarian <at> mgsn.dev>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sat, 18 Sep 2021 17:15:02 GMT) Full text and rfc822 format available.

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

From: Sarah Morgensen <iskarian <at> mgsn.dev>
To: guix-patches <at> gnu.org
Subject: [PATCH core-updates-frozen] gnu: curl: Respect #:tests?.
Date: Sat, 18 Sep 2021 10:14:34 -0700
* gnu/packages/curl.scm (curl)[arguments]<#:phases>{check}: Respect #:tests?.
---
 gnu/packages/curl.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 063a919700..17aed51fdd 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -124,16 +124,16 @@
              (rename-file (string-append out "/share/man/man3")
                           (string-append doc "/share/man/man3"))
              #t)))
-        (replace
-         'check
-         (lambda _
-           (substitute* "tests/runtests.pl"
-             (("/bin/sh") (which "sh")))
+        (replace 'check
+          (lambda* (#:key (tests? (not target)) #:allow-other-keys)
+            (substitute* "tests/runtests.pl"
+              (("/bin/sh") (which "sh")))
 
-           ;; The top-level "make check" does "make -C tests quiet-test", which
-           ;; is too quiet.  Use the "test" target instead, which is more
-           ;; verbose.
-           (invoke "make" "-C" "tests" "test"))))))
+            (when tests?
+              ;; The top-level "make check" does "make -C tests quiet-test", which
+              ;; is too quiet.  Use the "test" target instead, which is more
+              ;; verbose.
+              (invoke "make" "-C" "tests" "test")))))))
    (synopsis "Command line tool for transferring data with URL syntax")
    (description
     "curl is a command line tool for transferring data with URL syntax,

base-commit: 8613652f3f80105f35db13d6d9308257bbff8474
-- 
2.33.0





Information forwarded to guix-patches <at> gnu.org:
bug#50664; Package guix-patches. (Sun, 19 Sep 2021 15:51:02 GMT) Full text and rfc822 format available.

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

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Sarah Morgensen <iskarian <at> mgsn.dev>
Cc: 50664 <at> debbugs.gnu.org
Subject: Re: bug#50664: [PATCH core-updates-frozen] gnu: curl: Respect
 #:tests?.
Date: Sun, 19 Sep 2021 15:50:18 +0000
Hello Sarah,

> +          (lambda* (#:key (tests? (not target)) #:allow-other-keys)

I'm not sure we need the default value here, as it's already part of the
build system.

Otherwise looks nice. We can apply when merging other world rebuilding
changes, or directly on core-updates for the next round.

Thanks,

Mathieu




Information forwarded to guix-patches <at> gnu.org:
bug#50664; Package guix-patches. (Sun, 19 Sep 2021 18:47:02 GMT) Full text and rfc822 format available.

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

From: Sarah Morgensen <iskarian <at> mgsn.dev>
To: 50664 <at> debbugs.gnu.org
Cc: othacehe <at> gnu.org
Subject: [PATCH core-updates-frozen v2] gnu: curl: Respect #:tests?.
Date: Sun, 19 Sep 2021 11:46:52 -0700
* gnu/packages/curl.scm (curl)[arguments]<#:phases>{check}: Respect #:tests?.
---
Changes from v1:

* Do not provide a default value for tests?, since gnu-build-system provides
  one.

--
Sarah
 gnu/packages/curl.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 063a919700..4c90c7b301 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -124,16 +124,16 @@
              (rename-file (string-append out "/share/man/man3")
                           (string-append doc "/share/man/man3"))
              #t)))
-        (replace
-         'check
-         (lambda _
-           (substitute* "tests/runtests.pl"
-             (("/bin/sh") (which "sh")))
+        (replace 'check
+          (lambda* (#:key tests? #:allow-other-keys)
+            (substitute* "tests/runtests.pl"
+              (("/bin/sh") (which "sh")))
 
-           ;; The top-level "make check" does "make -C tests quiet-test", which
-           ;; is too quiet.  Use the "test" target instead, which is more
-           ;; verbose.
-           (invoke "make" "-C" "tests" "test"))))))
+            (when tests?
+              ;; The top-level "make check" does "make -C tests quiet-test", which
+              ;; is too quiet.  Use the "test" target instead, which is more
+              ;; verbose.
+              (invoke "make" "-C" "tests" "test")))))))
    (synopsis "Command line tool for transferring data with URL syntax")
    (description
     "curl is a command line tool for transferring data with URL syntax,

base-commit: 8613652f3f80105f35db13d6d9308257bbff8474
-- 
2.33.0





Added blocking bug(s) 50358 Request was from Mathieu Othacehe <mathieu <at> meije.i-did-not-set--mail-host-address--so-tickle-me> to control <at> debbugs.gnu.org. (Sun, 19 Sep 2021 18:54:02 GMT) Full text and rfc822 format available.

Reply sent to Maxim Cournoyer <maxim.cournoyer <at> gmail.com>:
You have taken responsibility. (Fri, 12 Nov 2021 05:53:01 GMT) Full text and rfc822 format available.

Notification sent to Sarah Morgensen <iskarian <at> mgsn.dev>:
bug acknowledged by developer. (Fri, 12 Nov 2021 05:53:01 GMT) Full text and rfc822 format available.

Message #18 received at 50664-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Sarah Morgensen <iskarian <at> mgsn.dev>
Cc: othacehe <at> gnu.org, 50664-done <at> debbugs.gnu.org
Subject: Re: bug#50664: [PATCH core-updates-frozen] gnu: curl: Respect
 #:tests?.
Date: Fri, 12 Nov 2021 00:52:43 -0500
Hello,

Sarah Morgensen <iskarian <at> mgsn.dev> writes:

> * gnu/packages/curl.scm (curl)[arguments]<#:phases>{check}: Respect #:tests?.
> ---
> Changes from v1:
>
> * Do not provide a default value for tests?, since gnu-build-system provides
>   one.
>
> --
> Sarah
>  gnu/packages/curl.scm | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
> index 063a919700..4c90c7b301 100644
> --- a/gnu/packages/curl.scm
> +++ b/gnu/packages/curl.scm
> @@ -124,16 +124,16 @@
>               (rename-file (string-append out "/share/man/man3")
>                            (string-append doc "/share/man/man3"))
>               #t)))
> -        (replace
> -         'check
> -         (lambda _
> -           (substitute* "tests/runtests.pl"
> -             (("/bin/sh") (which "sh")))
> +        (replace 'check
> +          (lambda* (#:key tests? #:allow-other-keys)
> +            (substitute* "tests/runtests.pl"
> +              (("/bin/sh") (which "sh")))
>  
> -           ;; The top-level "make check" does "make -C tests quiet-test", which
> -           ;; is too quiet.  Use the "test" target instead, which is more
> -           ;; verbose.
> -           (invoke "make" "-C" "tests" "test"))))))
> +            (when tests?
> +              ;; The top-level "make check" does "make -C tests quiet-test", which
> +              ;; is too quiet.  Use the "test" target instead, which is more
> +              ;; verbose.
> +              (invoke "make" "-C" "tests" "test")))))))
>     (synopsis "Command line tool for transferring data with URL syntax")
>     (description
>      "curl is a command line tool for transferring data with URL syntax,
>
> base-commit: 8613652f3f80105f35db13d6d9308257bbff8474

This got merged in core-updates-frozen as
460d6aca0c9a8f8443d50e5a5cf2bf9841bcc559; and I just noticed I had
forgotten to put my signed-off-by line; apologies.

Thank you!

Closing.

Maxim




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 10 Dec 2021 12:24:10 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 99 days ago.

Previous Next


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