public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Michael J Gruber <git@grubix•eu>
Cc: git@vger•kernel.org, Elia Pinto <gitter.spiros@gmail•com>
Subject: Re: [PATCH] test-lib: declare local variables as local
Date: Wed, 09 Mar 2022 14:02:38 -0800	[thread overview]
Message-ID: <xmqqv8wmlr7l.fsf@gitster.g> (raw)
In-Reply-To: <81f43fbefde84ab7af9ee2ac760845b728a48ab5.1646861976.git.git@grubix.eu> (Michael J. Gruber's message of "Wed, 9 Mar 2022 22:41:43 +0100")

Michael J Gruber <git@grubix•eu> writes:

> 131b94a10a ("test-lib.sh: Use GLIBC_TUNABLES instead of MALLOC_CHECK_ on
> glibc >= 2.34", 2022-03-04) introduced "local" variables without
> declaring them as such. This conflicts with their use in some tests (at
> least when running them with dash), leading to test failures in:

Thanks.

>
> t0006-date.sh
> t2002-checkout-cache-u.sh
> t3430-rebase-merges.sh
> t4138-apply-ws-expansion.sh
> t4124-apply-ws-rule.sh
>
> Declare those variables as local to let the tests pass again.
>
> Signed-off-by: Michael J Gruber <git@grubix•eu>
> ---
>  t/test-lib.sh | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index a3b711988c..e3c9822bf3 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -548,6 +548,8 @@ then
>  	}
>  else
>  	setup_malloc_check () {
> +		local g
> +		local t
>  		MALLOC_CHECK_=3	MALLOC_PERTURB_=165
>  		export MALLOC_CHECK_ MALLOC_PERTURB_
>  		if _GLIBC_VERSION=$(getconf GNU_LIBC_VERSION 2>/dev/null) &&

     prev parent reply	other threads:[~2022-03-09 22:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-09 21:41 [PATCH] test-lib: declare local variables as local Michael J Gruber
2022-03-09 22:02 ` Junio C Hamano [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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqv8wmlr7l.fsf@gitster.g \
    --to=gitster@pobox$(echo .)com \
    --cc=git@grubix$(echo .)eu \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitter.spiros@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox