[PATCH] test-lib.sh: use awk instead of expr for a POSIX non integer check
- From
Carlo Marcelo Arenas Belón <carenas@gmail.com>
- Date
- Mar 8, 2022, 11:33 UTC
- Message-ID
- <20220308113305.39395-1-carenas@gmail.com>
- In-Reply-To
- <20220304133702.26706-1-gitter.spiros@gmail.com>
Restrict the glibc version to a single version number and compare it arithmetically against the base glibc version to avoid accidentally matching against "2.3" and better supporting versions like "2.34.9000"
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> --- t/test-lib.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh index 8e59c58e7e7..f624f87eb81 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -518,9 +518,9 @@ else setup_malloc_check () { MALLOC_CHECK_=3 MALLOC_PERTURB_=165 export MALLOC_CHECK_ MALLOC_PERTURB_ - if _GLIBC_VERSION=$(getconf GNU_LIBC_VERSION 2>/dev/null) && - _GLIBC_VERSION=${_GLIBC_VERSION#"glibc "} && - expr 2.34 \<= "$_GLIBC_VERSION" >/dev/null + local _GLIBC_VERSION=$(getconf GNU_LIBC_VERSION 2>/dev/null) + if echo "$_GLIBC_VERSION" | cut -d. -f1-2 | + awk '{ if ($2 - 2.34 < 0) exit 1 }' then g= LD_PRELOAD="libc_malloc_debug.so.0"
-- 2.35.1.505.g27486cd1b2d