kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

tests: cache glibc version check 

131b94a10a ("test-lib.sh: Use GLIBC_TUNABLES instead of MALLOC_CHECK_
on glibc >= 2.34", 2022-03-04) introduced a check for the version of
glibc that is in use. This check is performed as part of
setup_malloc_check() which is called at least once for each test. As
the test involves forking `getconf` and `expr` cache the result and
use that within setup_malloc_check() to avoid forking these extra
processes for each test.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Phillip Wood 2022-08-04 13:38:25 +00:00 committed by Junio C Hamano
parent 00d12607a2
commit a6a58f7801
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
t/test-lib.sh
View File

@ -557,14 +557,19 @@ then
: nothing : nothing
} }
else else
_USE_GLIBC_TUNABLES=
if _GLIBC_VERSION=$(getconf GNU_LIBC_VERSION 2>/dev/null) &&
_GLIBC_VERSION=${_GLIBC_VERSION#"glibc "} &&
expr 2.34 \<= "$_GLIBC_VERSION" >/dev/null
then
_USE_GLIBC_TUNABLES=YesPlease
fi
setup_malloc_check () { setup_malloc_check () {
local g local g
local t local t
MALLOC_CHECK_=3 MALLOC_PERTURB_=165 MALLOC_CHECK_=3 MALLOC_PERTURB_=165
export MALLOC_CHECK_ MALLOC_PERTURB_ export MALLOC_CHECK_ MALLOC_PERTURB_
if _GLIBC_VERSION=$(getconf GNU_LIBC_VERSION 2>/dev/null) && if test -n "$_USE_GLIBC_TUNABLES"
_GLIBC_VERSION=${_GLIBC_VERSION#"glibc "} &&
expr 2.34 \<= "$_GLIBC_VERSION" >/dev/null
then then
g= g=
LD_PRELOAD="libc_malloc_debug.so.0" LD_PRELOAD="libc_malloc_debug.so.0"