summaryrefslogtreecommitdiff
path: root/t/test-lib.sh
diff options
context:
space:
mode:
authorMichael J Gruber <git@grubix.eu>2022-03-09 21:41:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-03-09 22:02:45 (GMT)
commitbaedc5954348b30faa421333289b30818daf36c3 (patch)
treecb85ac365edd99784b46ff1e1da2c0558ffd14a2 /t/test-lib.sh
parent131b94a10a77e40eb3b3ba276d07fb663e220cd1 (diff)
downloadgit-baedc5954348b30faa421333289b30818daf36c3.zip
git-baedc5954348b30faa421333289b30818daf36c3.tar.gz
git-baedc5954348b30faa421333289b30818daf36c3.tar.bz2
test-lib: declare local variables as local
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/test-lib.sh')
-rw-r--r--t/test-lib.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 8e59c58..cf3fa45 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -516,6 +516,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) &&