grep branch, master, updated. v3.11-34-geda769b

[Paul Eggert]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  eda769be72def8a14098af968e04cc6952fc53a3 (commit)
      from  3612f5e2181afe4855adbaef6f783f092d50d8d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=eda769be72def8a14098af968e04cc6952fc53a3


commit eda769be72def8a14098af968e04cc6952fc53a3
Author: Bruno Haible <bruno@clisp.org>
Date:   Mon Jul 8 14:06:16 2024 +0200

    tests: Fix recognition of cs_CZ.UTF-8 locale on FreeBSD.
    
    * tests/fmbtest: Use 'locale charmap' to determine the locale's encoding.
    * tests/foad1: Likewise.

diff --git a/tests/fmbtest b/tests/fmbtest
index 38dd49d..f3404fd 100755
--- a/tests/fmbtest
+++ b/tests/fmbtest
@@ -10,7 +10,7 @@
 cz=cs_CZ.UTF-8
 
 # If cs_CZ.UTF-8 locale doesn't work, skip this test.
-LC_ALL=$cz locale -k LC_CTYPE 2>/dev/null | grep -q charmap.*UTF-8 \
+test "`LC_ALL=$cz locale charmap 2>/dev/null`" = UTF-8 \
   || skip_ this system lacks the $cz locale
 
 # If matching is done in single-byte mode, skip this test too
diff --git a/tests/foad1 b/tests/foad1
index 3a29f9e..b87e3f3 100755
--- a/tests/foad1
+++ b/tests/foad1
@@ -150,7 +150,7 @@ Exit $failures
 # The rest of this file is meant to be executed under this locale.
 LC_ALL=cs_CZ.UTF-8; export LC_ALL
 # If the UTF-8 locale doesn't work, skip these tests silently.
-locale -k LC_CTYPE 2>/dev/null | grep -q "charmap.*UTF-8" || Exit $failures
+test "`locale charmap 2>/dev/null`" = UTF-8 || Exit $failures
 
 # Test character class erroneously matching a '[' character.
 grep_test "[/" "" "[[:alpha:]]" -E

-----------------------------------------------------------------------

Summary of changes:
 tests/fmbtest | 2 +-
 tests/foad1   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep