grep branch, master, updated. v3.8-18-g231a3ea

[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  231a3ea66d556c709b53ecc93bdc072be3e8f7ce (commit)
       via  3635121123e086b9092c7118dc0a99cb1736dc25 (commit)
      from  8f6a1e90e4f14390ef2171aa37a1866f90292914 (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=231a3ea66d556c709b53ecc93bdc072be3e8f7ce


commit 231a3ea66d556c709b53ecc93bdc072be3e8f7ce
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Thu Jan 12 23:11:59 2023 -0800

    tests: better diagnostic for -P sans Unicode
    
    * tests/init.cfg (require_pcre_): When in a UTF-8 locale, test
    also for Unicode support so that it can be diagnosed differently
    (Bug#60708).

diff --git a/tests/init.cfg b/tests/init.cfg
index 515482c..4aa56ea 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -48,10 +48,18 @@ require_timeout_()
 
 require_pcre_()
 {
-  echo . | grep -P . 2>err || {
-    test $? -eq 1 && fail_ PCRE available, but does not work.
-    skip_ no PCRE support
-  }
+  case $LC_ALL in
+    *.UTF-8)
+      printf '\303\241\n' | grep -P '^.$' 2>err || {
+        test $? -eq 1 && fail_ PCRE available, but does not work
+        skip_ no PCRE Unicode support
+      };;
+    *)
+      echo . | grep -P '^.$' 2>err || {
+        test $? -eq 1 && fail_ PCRE available, but does not work.
+        skip_ no PCRE support
+      };;
+  esac
   compare /dev/null err || fail_ PCRE available, but stderr not empty.
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3635121123e086b9092c7118dc0a99cb1736dc25


commit 231a3ea66d556c709b53ecc93bdc072be3e8f7ce
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Thu Jan 12 23:11:59 2023 -0800

    tests: better diagnostic for -P sans Unicode
    
    * tests/init.cfg (require_pcre_): When in a UTF-8 locale, test
    also for Unicode support so that it can be diagnosed differently
    (Bug#60708).

diff --git a/tests/init.cfg b/tests/init.cfg
index 515482c..4aa56ea 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -48,10 +48,18 @@ require_timeout_()
 
 require_pcre_()
 {
-  echo . | grep -P . 2>err || {
-    test $? -eq 1 && fail_ PCRE available, but does not work.
-    skip_ no PCRE support
-  }
+  case $LC_ALL in
+    *.UTF-8)
+      printf '\303\241\n' | grep -P '^.$' 2>err || {
+        test $? -eq 1 && fail_ PCRE available, but does not work
+        skip_ no PCRE Unicode support
+      };;
+    *)
+      echo . | grep -P '^.$' 2>err || {
+        test $? -eq 1 && fail_ PCRE available, but does not work.
+        skip_ no PCRE support
+      };;
+  esac
   compare /dev/null err || fail_ PCRE available, but stderr not empty.
 }
 

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

Summary of changes:
 src/pcresearch.c |  8 +++++---
 tests/init.cfg   | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
grep