threads / patch / 57527

patchtest-lib: declare local variables as local

Subject: [PATCH] test-lib: declare local variables as local

## tl;dr

2 messages between Mar 9, 2022 and Mar 9, 2022. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Michael J Gruber· Mar 9, 2022, 21:41 UTC · lore

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(+)

Show changes to t/test-lib.sh +2 −0

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

Junio C Hamano· Mar 9, 2022, 22:02 UTC · re: Michael J Gruber · lore

Re: [PATCH] test-lib: declare local variables as local

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.

Show 27 quoted lines

>
> 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) &&