grep branch, master, updated. v3.7-40-g4396e12

[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  4396e12b8ca7046526d3cfd0dc433de5695b112e (commit)
      from  4406a0d28f3689fc79778e06c2f6c11be7f3cb92 (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=4396e12b8ca7046526d3cfd0dc433de5695b112e


commit 4396e12b8ca7046526d3cfd0dc433de5695b112e
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Nov 23 18:28:10 2021 -0800

    tests: skip surrogate-search test on Cygwin
    
    Cygwin does not support surrogate-pair search strings, so
    skip the test there (Bug#27555).
    * tests/Makefile.am (TESTS): Add surrogate-search.
    * tests/surrogate-pair: Remove surrogate-search test,
    which is now done by surrogate-search.
    * tests/surrogate-search: New test, which is skipped on Cygwin.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c84cdc0..92f194f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -161,6 +161,7 @@ TESTS =                                             \
   stack-overflow                               \
   status                                       \
   surrogate-pair                               \
+  surrogate-search                             \
   symlink                                      \
   triple-backref                               \
   turkish-I                                    \
diff --git a/tests/surrogate-pair b/tests/surrogate-pair
index a91fa36..c1cbaba 100755
--- a/tests/surrogate-pair
+++ b/tests/surrogate-pair
@@ -51,10 +51,4 @@ case $io_pair in
   *) fail_ "unexpected output: $io_pair"; fail=1;;
 esac
 
-# Also test whether a surrogate-pair in the search string works.
-for opt in '' -i -E -F -iE -iF; do
-  grep --file=in $opt in > out 2>&1 || fail=1
-  compare out in || fail=1
-done
-
 Exit $fail
diff --git a/tests/surrogate-pair b/tests/surrogate-search
similarity index 52%
copy from tests/surrogate-pair
copy to tests/surrogate-search
index a91fa36..2679c3c 100755
--- a/tests/surrogate-pair
+++ b/tests/surrogate-search
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Check the handling of characters outside the Unicode BMP.
+# Check characters outside the Unicode BMP in the search string.
 
-# Copyright (C) 2013-2021 Free Software Foundation, Inc.
+# Copyright 2021 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,6 +21,11 @@
 require_en_utf8_locale_
 require_compiled_in_MB_support
 
+case $(uname -s) in
+  CYGWIN*)
+    skip_ 'surrogate-pair search string on Cygwin, where it cannot work';;
+esac
+
 fail=0
 
 s_pair=$(printf '\360\220\220\205')
@@ -29,29 +34,6 @@ printf '%s\n' "$s_pair" > in || framework_failure_
 LC_ALL=en_US.UTF-8
 export LC_ALL
 
-# On Cygwin, before grep-2.15, this would segfault.
-# Require not just non-zero exit status, but exactly 1.
-returns_ 1 grep -i anything-else in > out 2>&1 || fail=1
-# Expect no output.
-compare /dev/null out || fail=1
-
-# This must always match, even on a 16-bit-wchar_t system.
-grep . in > out 2> err || fail=1
-
-# On platforms where wchar_t is only 16 bits, wchar_t cannot represent
-# the character encoded in 'in'.
-
-# On such old systems the above prints nothing on stdout and a diagnostic
-# on stderr.  In that case, return early; otherwise, the following tests
-# would all fail.
-io_pair=$(cat out):$(cat err)
-case $io_pair in
-  :'grep: in: binary file matches') Exit $fail;;
-  $s_pair:) ;;
-  *) fail_ "unexpected output: $io_pair"; fail=1;;
-esac
-
-# Also test whether a surrogate-pair in the search string works.
 for opt in '' -i -E -F -iE -iF; do
   grep --file=in $opt in > out 2>&1 || fail=1
   compare out in || fail=1

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

Summary of changes:
 tests/Makefile.am                        |  1 +
 tests/surrogate-pair                     |  6 ------
 tests/{pcre-infloop => surrogate-search} | 25 +++++++++++++++++--------
 3 files changed, 18 insertions(+), 14 deletions(-)
 copy tests/{pcre-infloop => surrogate-search} (66%)


hooks/post-receive
-- 
grep