From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Todd Zullinger <tmz@pobox.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Michael J Gruber <git@grubix.eu>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v2] add -i tests: mark "TODO" depending on GIT_TEST_ADD_I_USE_BUILTIN
Date: Thu, 16 Jun 2022 12:16:46 +0200 [thread overview]
Message-ID: <220616.86sfo4x5zw.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <YqlIRveupj6tOO4P@pobox.com>
On Tue, Jun 14 2022, Todd Zullinger wrote:
> Ævar Arnfjörð Bjarmason wrote:
>> Fix an issue that existed before 0527ccb1b55 (add -i: default to the
>> built-in implementation, 2021-11-30), but which became the default
>> with that change, we should not be marking tests that are known to
>> pass as "TODO" tests.
> [...]
>> ---
>> Just converting it to "test_expect_success" will break CI and other
>> setups that are testing with GIT_TEST_ADD_I_USE_BUILTIN=false.
>>
>> The below fixes it, however.
>
> Nice catch. FWIW, I tested w/GIT_TEST_ADD_I_USE_BUILTIN=0
> and without.
My patch landed on "master" as 7ccbea564e8 (add -i tests: mark "TODO"
depending on GIT_TEST_ADD_I_USE_BUILTIN, 2022-06-14) so this is water
under the bridge.
But just to tie this loose knot I think something went wrong in your
testing.
If I:
git checkout v2.37.0-rc0
# Apply your patch from <20220614185218.1091413-1-tmz@pobox.com>
I'll consistently get a failure from:
GIT_TEST_ADD_I_USE_BUILTIN=false ./t3701-add-interactive.sh
Since we do fail that test with the Perl implementation, and now it's no
longer a TODO test.
Perhaps you used it as a parameter to "make"? I.e.:
make GIT_TEST_ADD_I_USE_BUILTIN=false
make test
Which isn't how it works, just speculating...
>> diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh
>> index bc3f69b4b1d..a5822e41af2 100755
>> --- a/t/t2016-checkout-patch.sh
>> +++ b/t/t2016-checkout-patch.sh
>> @@ -4,7 +4,7 @@ test_description='git checkout --patch'
>>
>> . ./lib-patch-mode.sh
>>
>> -if ! test_bool_env GIT_TEST_ADD_I_USE_BUILTIN true && ! test_have_prereq PERL
>> +if ! test_have_prereq ADD_I_USE_BUILTIN && ! test_have_prereq PERL
>> then
>> skip_all='skipping interactive add tests, PERL not set'
>
> It's not the fault of this patch, but it makes it obvious
> that the `skip_all` message is no longer accurate. Perhaps
> somethine like this?
>
> skip_all='skipping interactive add tests, missing ADD_I_USE_BUILTIN or PERL'
>
> Maybe a separate `ADD_I` prereq would be better? Though
> without looking closer, I don't know if that would end up
> being clearer to anyone running the tests without either
> PERL or the add -i builtin enabled.
Yeah seems like a good idea for a follow-up, but since it's landed I'll
probably forget :)
> Thanks for the keen eye and attention to detail, Ævar,
Happy to have it fixed!
next prev parent reply other threads:[~2022-06-16 10:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 15:26 [PATCH] t3701: two subtests are fixed Michael J Gruber
2022-06-14 15:40 ` [PATCH v2] add -i tests: mark "TODO" depending on GIT_TEST_ADD_I_USE_BUILTIN Ævar Arnfjörð Bjarmason
2022-06-15 2:47 ` Todd Zullinger
2022-06-16 10:16 ` Ævar Arnfjörð Bjarmason [this message]
2022-06-16 13:47 ` Todd Zullinger
2022-06-14 15:48 ` [PATCH] t3701: two subtests are fixed Derrick Stolee
2022-06-15 1:25 ` Todd Zullinger
2022-06-15 1:55 ` Taylor Blau
2022-06-15 14:50 ` Johannes Schindelin
2022-06-16 9:14 ` Michael J Gruber
2022-06-16 16:50 ` Junio C Hamano
2022-06-18 11:55 ` Johannes Schindelin
2022-06-21 15:45 ` Junio C Hamano
2022-06-22 8:24 ` Michael J Gruber
2022-06-23 15:55 ` Johannes Schindelin
2022-06-23 16:33 ` 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=220616.86sfo4x5zw.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tmz@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).