grep branch, master, updated. v2.20-83-g0690074

[Jim Meyering]

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  0690074f62b0e65e00c946cc606745dab008117d (commit)
       via  0604c6de0186c21724546ece7fd19cf73617f8af (commit)
      from  2ac355101d867f3231fd62ee131c0c98bb2eafa1 (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=0690074f62b0e65e00c946cc606745dab008117d


commit 0690074f62b0e65e00c946cc606745dab008117d
Author: Jim Meyering <address@hidden>
Date:   Sun Nov 9 10:02:40 2014 -0800

    tests: do not fail when the zh_CN.UTF-8 locale is not installed
    
    * tests/word-multibyte: This test would fail on a system with
    no zh_CN.UTF-8 locale. Use it only if it is installed.

diff --git a/tests/word-multibyte b/tests/word-multibyte
index e50fd4f..9cbb71f 100755
--- a/tests/word-multibyte
+++ b/tests/word-multibyte
@@ -7,9 +7,17 @@ require_en_utf8_locale_
 e_acute=$(printf '\303\251')
 printf "$e_acute\n" > in || framework_failure_
 
+# Use this locale only if it is installed.
+zh=zh_CN.UTF-8
+path_prepend_ .
+case $(get-mb-cur-max $zh) in
+  [456]) ;;
+  *) zh=;;
+esac
+
 fail=0
 
-for LOC in en_US.UTF-8 zh_CN.UTF-8 $LOCALE_FR_UTF8; do
+for LOC in en_US.UTF-8 $zh $LOCALE_FR_UTF8; do
   out=out1-$LOC
   LC_ALL=$LOC grep '\w' in >$out || fail=1
   compare in $out || fail=1

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=0604c6de0186c21724546ece7fd19cf73617f8af


commit 0690074f62b0e65e00c946cc606745dab008117d
Author: Jim Meyering <address@hidden>
Date:   Sun Nov 9 10:02:40 2014 -0800

    tests: do not fail when the zh_CN.UTF-8 locale is not installed
    
    * tests/word-multibyte: This test would fail on a system with
    no zh_CN.UTF-8 locale. Use it only if it is installed.

diff --git a/tests/word-multibyte b/tests/word-multibyte
index e50fd4f..9cbb71f 100755
--- a/tests/word-multibyte
+++ b/tests/word-multibyte
@@ -7,9 +7,17 @@ require_en_utf8_locale_
 e_acute=$(printf '\303\251')
 printf "$e_acute\n" > in || framework_failure_
 
+# Use this locale only if it is installed.
+zh=zh_CN.UTF-8
+path_prepend_ .
+case $(get-mb-cur-max $zh) in
+  [456]) ;;
+  *) zh=;;
+esac
+
 fail=0
 
-for LOC in en_US.UTF-8 zh_CN.UTF-8 $LOCALE_FR_UTF8; do
+for LOC in en_US.UTF-8 $zh $LOCALE_FR_UTF8; do
   out=out1-$LOC
   LC_ALL=$LOC grep '\w' in >$out || fail=1
   compare in $out || fail=1

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

Summary of changes:
 tests/init.cfg       |    6 ++++--
 tests/word-multibyte |   10 +++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
grep