Merge branch 'ep/test-malloc-check-with-glibc-2.34' into next

gitster · gitster · commit 13ed9014e648 · 2022-03-12T22:18:14.000-08:00
The method to trigger malloc check used in our tests no longer work
with newer versions of glibc.

* ep/test-malloc-check-with-glibc-2.34:
  test-lib: declare local variables as local
diff --git 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) &&

Original file line number	Diff line number	Diff line change
`@@ -548,6 +548,8 @@ then`
`548`	`548`	`}`
`549`	`549`	`else`
`550`	`550`	`setup_malloc_check () {`
	`551`	`+ local g`
	`552`	`+ local t`
`551`	`553`	`MALLOC_CHECK_=3 MALLOC_PERTURB_=165`
`552`	`554`	`export MALLOC_CHECK_ MALLOC_PERTURB_`
`553`	`555`	`if _GLIBC_VERSION=$(getconf GNU_LIBC_VERSION 2>/dev/null) &&`