grep branch, master, updated. v3.3-46-g4985a28

[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  4985a28875c825aeb383c53a509400685f04b844 (commit)
      from  d9795ffa6894cd5694a90a13ecbde463f9060b73 (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=4985a28875c825aeb383c53a509400685f04b844


commit 4985a28875c825aeb383c53a509400685f04b844
Author: Paul Eggert <address@hidden>
Date:   Thu Dec 26 01:05:50 2019 -0800

    maint: adjust surrogate-pair for 16-bit wchar_t
    
    * tests/surrogate-pair: Adjust to match fixed behavior
    on AIX 7.2, where wchar_t is 16 bits and cannot represent
    the test case data.

diff --git a/tests/surrogate-pair b/tests/surrogate-pair
index d6d31f0..8d23cdf 100755
--- a/tests/surrogate-pair
+++ b/tests/surrogate-pair
@@ -1,6 +1,5 @@
 #!/bin/sh
 # Check the handling of characters outside the Unicode BMP.
-# Known failures: This test currently fails on Cygwin and AIX.
 
 # Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
@@ -26,6 +25,10 @@ fail=0
 
 printf '\360\220\220\205\n' > in || framework_failure_
 
+# On platforms where wchar_t is only 16 bits, wchar_t cannot represent
+# the character encoded in 'in', so accept that behavior too.
+printf 'Binary file in matches\n' > out16 || framework_failure_
+
 LC_ALL=en_US.UTF-8
 export LC_ALL
 
@@ -38,7 +41,7 @@ compare /dev/null out || fail=1
 # 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
+  compare out in || compare out out16 || fail=1
 done
 
 Exit $fail

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

Summary of changes:
 tests/surrogate-pair | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep