grep branch, master, updated. v2.20-87-gd48e658

[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  d48e658e03a70ff648801cbea698c11abff80016 (commit)
      from  323f8b3614ab2e450e2839b3d0a1d260097f2e6b (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=d48e658e03a70ff648801cbea698c11abff80016


commit d48e658e03a70ff648801cbea698c11abff80016
Author: Paul Eggert <address@hidden>
Date:   Tue Nov 11 22:34:41 2014 -0800

    tests: port to Darwin
    
    The 'sed' command 's/.//' does not delete all bytes in the C locale.
    Problem reported by Nelson H. F. Beebe.
    * tests/fmbtest: Don't assume that sed treats bytes with the
    top bit set as valid characters in the C locale, as this is not
    true for Darwin.  Use the cs_CZ.UTF-8 locale instead, and
    simplify the sed script.

diff --git a/tests/fmbtest b/tests/fmbtest
index bec5403..bfaf607 100755
--- a/tests/fmbtest
+++ b/tests/fmbtest
@@ -52,30 +52,30 @@ EOF
 
 for mode in F G E; do
 
-test1="$(echo $(LC_ALL=$cz grep -${mode} -f cspatfile csinput \
-               | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
+test1=$(echo $(LC_ALL=$cz; export LC_ALL
+               grep -${mode} -f cspatfile csinput | sed 's/[^0-9]/ /g'))
 if test "$test1" != "11 12 13 14 15 16 17 18"; then
   echo "Test #1 ${mode} failed: $test1"
   failures=1
 fi
 
-test2="$(echo $(LC_ALL=$cz grep -${mode}i -f cspatfile csinput \
-               | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
+test2=$(echo $(LC_ALL=$cz; export LC_ALL
+               grep -${mode}i -f cspatfile csinput | sed 's/[^0-9]/ /g'))
 if test "$test2" != "01 02 07 08 10 11 12 13 14 15 16 17 18 19 20"; then
   echo "Test #2 ${mode} failed: $test2"
   failures=1
 fi
 
-test3="$(echo $(LC_ALL=$cz grep -${mode}i -e 'ČÍšE' -e 'Čas' csinput \
-               | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
+test3=$(echo $(LC_ALL=$cz; export LC_ALL
+               grep -${mode}i -e 'ČÍšE' -e 'Čas' csinput | sed 's/[^0-9]/ 
/g'))
 if test "$test3" != "01 02 07 08 10 11 12 13 14 15 16 17 18 19 20"; then
   echo "Test #3 ${mode} failed: $test3"
   failures=1
 fi
 
 # Skip the next test - known to fail. TAA.
-#test4="$(echo $(LC_ALL=$cz grep -${mode}iw -f cspatfile csinput \
-#             | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
+#test4=$(echo $(LC_ALL=$cz; export LC_ALL
+#               grep -${mode}iw -f cspatfile csinput | sed 's/[^0-9]/ /g'))
 #if test "$test4" != "01 02 08 13 17 19"; then
 #  echo "Test #4 ${mode} failed: $test4"
 #  failures=1
@@ -113,8 +113,9 @@ done
 
 for mode in G E; do
 
-test8="$(echo $(LC_ALL=$cz grep -${mode}i -e 'Č.šE' -e 'Č[a-f]s' csinput \
-               | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
+test8=$(echo $(LC_ALL=$cz; export LC_ALL
+               grep -${mode}i -e 'Č.šE' -e 'Č[a-f]s' csinput |
+                 sed 's/[^0-9]/ /g'))
 if test "$test8" != "01 02 07 08 10 11 12 13 14 15 16 17 18 19 20"; then
   echo "Test #8 ${mode} failed: $test8"
   failures=1

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

Summary of changes:
 tests/fmbtest |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
grep