git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] test-lib.sh: use awk instead of expr for a POSIX non integer check

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Mar 8, 2022, 23:58 UTC
Message-ID
<CAPig+cT3TNFBMesYvYoncawfBdLqKL971SoP_J7F9FgnL10Eqw@mail.gmail.com>
In-Reply-To
<CAPig+cSNgQ7SEYk9M=L7z0G=hteTdupKS6sHJL8T7zEp=zkLEA@mail.gmail.com>
On Tue, Mar 8, 2022 at 6:55 PM Eric Sunshine <sunshine@sunshineco.com> wrote:
Show 22 quoted lines
> On Tue, Mar 8, 2022 at 6:44 PM Carlo Marcelo Arenas Belón
> <carenas@gmail.com> wrote:
> > 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>
> > ---
> > diff --git a/t/test-lib.sh b/t/test-lib.sh
> > @@ -518,9 +518,9 @@ else
> > -               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 }'
>
> No need for `cut` since `awk` can accomplish the same by itself.
>
>     if echo "$_GLIBC_VERSION" | awk '/^glibc / { if ($2 - 2.34 < 0) exit 1 }'
>
> should work, I would think.

Nevermind, I forgot you want to better support "2.34.9000" matches. Though, awk should still be able to do so on its own, one would expect, but not too important.

Previous: Eric SunshineNext: Eric Sunshine
Message 5 of 19 in “test-lib.sh: Use GLIBC_TUNABLES instead of MALLOC_CHECK_ on glibc >= 2.34”
  1. test-lib.sh: Use GLIBC_TUNABLES instead of MALLOC_CHECK_ on glibc >= 2.34Elia Pinto, Mar 4, 2022
  2. Junio C HamanoMar 4, 2022
  3. test-lib.sh: use awk instead of expr for a POSIX non integer checkCarlo Marcelo Arenas Belón, Mar 8, 2022
  4. Eric SunshineMar 8, 2022
  5. Eric SunshineMar 8, 2022
  6. Eric SunshineMar 9, 2022
  7. Junio C HamanoMar 9, 2022
  8. Ævar Arnfjörð BjarmasonMar 9, 2022
  9. Eric SunshineMar 11, 2022
  10. Ævar Arnfjörð BjarmasonMar 12, 2022
  11. Junio C HamanoMar 13, 2022
  12. Carlo ArenasMar 13, 2022
  13. Junio C HamanoMar 13, 2022
  14. Eric SunshineMar 11, 2022
  15. Elia PintoMar 13, 2022
  16. Phillip WoodApr 4, 2022
  17. Making the tests ~2.5x faster (was: [PATCH v3] test-lib.sh: Use GLIBC_TUNABLES instead of MALLOC_CHECK_ on glibc >= 2.34)Ævar Arnfjörð Bjarmason, Apr 5, 2022
  18. Phillip WoodApr 5, 2022
  19. Ævar Arnfjörð BjarmasonApr 5, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.