* [bug#50664] [PATCH core-updates-frozen] gnu: curl: Respect #:tests?.
@ 2021-09-18 17:14 Sarah Morgensen
2021-09-19 15:50 ` Mathieu Othacehe
2021-09-19 18:46 ` [bug#50664] [PATCH core-updates-frozen v2] " Sarah Morgensen
0 siblings, 2 replies; 4+ messages in thread
From: Sarah Morgensen @ 2021-09-18 17:14 UTC (permalink / raw)
To: 50664
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#50664] [PATCH core-updates-frozen] gnu: curl: Respect #:tests?.
2021-09-18 17:14 [bug#50664] [PATCH core-updates-frozen] gnu: curl: Respect #:tests? Sarah Morgensen
@ 2021-09-19 15:50 ` Mathieu Othacehe
2021-09-19 18:46 ` [bug#50664] [PATCH core-updates-frozen v2] " Sarah Morgensen
1 sibling, 0 replies; 4+ messages in thread
From: Mathieu Othacehe @ 2021-09-19 15:50 UTC (permalink / raw)
To: Sarah Morgensen; +Cc: 50664
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#50664] [PATCH core-updates-frozen v2] gnu: curl: Respect #:tests?.
2021-09-18 17:14 [bug#50664] [PATCH core-updates-frozen] gnu: curl: Respect #:tests? Sarah Morgensen
2021-09-19 15:50 ` Mathieu Othacehe
@ 2021-09-19 18:46 ` Sarah Morgensen
2021-11-12 5:52 ` bug#50664: [PATCH core-updates-frozen] " Maxim Cournoyer
1 sibling, 1 reply; 4+ messages in thread
From: Sarah Morgensen @ 2021-09-19 18:46 UTC (permalink / raw)
To: 50664; +Cc: othacehe
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#50664: [PATCH core-updates-frozen] gnu: curl: Respect #:tests?.
2021-09-19 18:46 ` [bug#50664] [PATCH core-updates-frozen v2] " Sarah Morgensen
@ 2021-11-12 5:52 ` Maxim Cournoyer
0 siblings, 0 replies; 4+ messages in thread
From: Maxim Cournoyer @ 2021-11-12 5:52 UTC (permalink / raw)
To: Sarah Morgensen; +Cc: othacehe, 50664-done
Hello,
Sarah Morgensen <iskarian@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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-11-12 5:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-18 17:14 [bug#50664] [PATCH core-updates-frozen] gnu: curl: Respect #:tests? Sarah Morgensen
2021-09-19 15:50 ` Mathieu Othacehe
2021-09-19 18:46 ` [bug#50664] [PATCH core-updates-frozen v2] " Sarah Morgensen
2021-11-12 5:52 ` bug#50664: [PATCH core-updates-frozen] " Maxim Cournoyer
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).