From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Derrick Stolee <derrickstolee@github.com>
Subject: Re: [PATCH 1/1] tests: add LIBCURL prerequisite to tests needing libcurl
Date: Wed, 15 Jun 2022 22:28:29 +0200 [thread overview]
Message-ID: <220615.861qvpy8jq.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <xmqq35g5232b.fsf@gitster.g>
On Wed, Jun 15 2022, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>
>> The existing "CURL" prerequisite is only used in one place, and we
>> should probably name it "CURL_PROGRAM",
>
> True. It probably wants to become a lazy prerequisite defined only
> in that program.
Yes, I have that fix, but left it out for the "for v2.37.0" ...
>> then rename "LIBCURL" to
>> "CURL" as a follow-up, but for now (pre-v2.37.0) let's aim for the
>> most minimal fix possible.
>
> OK.
>
>> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>> ---
>> t/lib-httpd.sh | 2 +-
>> t/t5516-fetch-push.sh | 4 ++--
>> t/t5601-clone.sh | 4 ++--
>> t/test-lib.sh | 1 +
>> 4 files changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
>> index 782891908d7..1f6b9b08d1d 100644
>> --- a/t/lib-httpd.sh
>> +++ b/t/lib-httpd.sh
>> @@ -29,7 +29,7 @@
>> # Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
>> #
>>
>> -if test -n "$NO_CURL"
>> +if ! test_have_prereq LIBCURL
>> then
>> skip_all='skipping test, git built without http support'
>> test_done
>
> This is not strictly needed in "the most minimal fix possible", is
> it? Just checking.
I figured if I was adding a $NO_CURL prereq I might as well change the
only existing use of $NO_CURL to use it, which also assures the reader
that our test suite is getting this from somewhere already.
But I'll drop this in a re-roll.
next prev parent reply other threads:[~2022-06-15 20:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-15 10:36 [PATCH 0/1] For v2.37.0: fix tests breaking with NO_CURL=Y Ævar Arnfjörð Bjarmason
2022-06-15 10:36 ` [PATCH 1/1] tests: add LIBCURL prerequisite to tests needing libcurl Ævar Arnfjörð Bjarmason
2022-06-15 18:29 ` Junio C Hamano
2022-06-15 20:28 ` Ævar Arnfjörð Bjarmason [this message]
2022-06-15 21:08 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=220615.861qvpy8jq.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.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).