git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jeff King <peff@peff.net>
Cc: Son Luong Ngoc <sluongng@gmail.com>,
	git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] t0000: disable GIT_TEST_FAIL_PREREQS in sub-tests
Date: Fri, 1 May 2020 22:56:44 +0200 (CEST)	[thread overview]
Message-ID: <nycvar.QRO.7.76.6.2005012256140.18039@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20200428081421.GA2381876@coredump.intra.peff.net>

Hi,

On Tue, 28 Apr 2020, Jeff King wrote:

> On Tue, Apr 28, 2020 at 08:52:34AM +0200, Son Luong Ngoc wrote:
>
> > Running t0000 with GIT_TEST_FAIL_PREREQS=true is failing.
> >
> > > GIT_TEST_FAIL_PREREQS=true ./t0000-basic.sh
> > t/./t0000-basic.sh:836: error: not ok 45 - lazy prereqs do not turn off tracing
> > #
> > #               run_sub_test_lib_test lazy-prereq-and-tracing
> >  'lazy prereqs and -x' -v -x <<-\EOF &&
> > #               test_lazy_prereq LAZY true
> > #
> > #               test_expect_success lazy 'test_have_prereq LAZY && echo trace'
> > #
> > #               test_done
> > #               EOF
> > #
> > #               grep 'echo trace' lazy-prereq-and-tracing/err
>
> I think the patch below is the right fix.
>
> -- >8 --
> Subject: [PATCH] t0000: disable GIT_TEST_FAIL_PREREQS in sub-tests
>
> The test added by 477dcaddb6 (tests: do not let lazy prereqs inside
> `test_expect_*` turn off tracing, 2020-03-26) runs a sub-test script
> that traces a test with a lazy prereq, like:
>
>   test_have_prereq LAZY && echo trace
>
> That won't work if GIT_TEST_FAIL_PREREQS is set in the environment,
> because our have_prereq will report failure, and we won't run the echo
> at all.
>
> We could work around this by avoiding the &&-chain, but we can
> fix this and any future tests at once by unsetting that variable for our
> sub-tests. These are meant to be controlled environments where we test
> the test-suite itself; the outer test snippet should be in charge of the
> sub-test environment, not whatever mode the user happens to be running
> in.

Thanks for fixing a bug I introduced! The fix looks good to me.

Thank you,
Dscho

>
> Reported-by: Son Luong Ngoc <sluongng@gmail.com>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
>  t/t0000-basic.sh | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
> index b859721620..f58f3deaa8 100755
> --- a/t/t0000-basic.sh
> +++ b/t/t0000-basic.sh
> @@ -98,6 +98,7 @@ _run_sub_test_lib_test_common () {
>  		export TEST_DIRECTORY &&
>  		TEST_OUTPUT_DIRECTORY=$(pwd) &&
>  		export TEST_OUTPUT_DIRECTORY &&
> +		sane_unset GIT_TEST_FAIL_PREREQS &&
>  		if test -z "$neg"
>  		then
>  			./"$name.sh" "$@" >out 2>err
> --
> 2.26.2.827.g3c1233342b
>
>

      reply	other threads:[~2020-05-01 20:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-28  6:52 t0000 failed Son Luong Ngoc
2020-04-28  8:14 ` [PATCH] t0000: disable GIT_TEST_FAIL_PREREQS in sub-tests Jeff King
2020-05-01 20:56   ` Johannes Schindelin [this message]

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=nycvar.QRO.7.76.6.2005012256140.18039@tvgsbejvaqbjf.bet \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    --cc=sluongng@gmail.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).