* [PATCH] test-lib: declare local variables as local
@ 2022-03-09 21:41 Michael J Gruber
2022-03-09 22:02 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Michael J Gruber @ 2022-03-09 21:41 UTC (permalink / raw)
To: git; +Cc: Elia Pinto
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:
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) &&
--
2.35.1.604.gdca35cc479
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] test-lib: declare local variables as local
2022-03-09 21:41 [PATCH] test-lib: declare local variables as local Michael J Gruber
@ 2022-03-09 22:02 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2022-03-09 22:02 UTC (permalink / raw)
To: Michael J Gruber; +Cc: git, Elia Pinto
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) &&
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-09 22:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox