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

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Sarah Morgensen <iskarian <at> mgsn.dev>
Subject: bug#50664: closed (Re: bug#50664: [PATCH core-updates-frozen]
 gnu: curl: Respect #:tests?.)
Date: Fri, 12 Nov 2021 05:53:01 +0000

[Message part 1 (text/plain, inline)]

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 50664 <at> debbugs.gnu.org.

-- 
50664: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=50664
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

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

[Message part 3 (message/rfc822, inline)]

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

Previous Next

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