grep branch, master, updated. v2.21-53-g1616111

[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  1616111f67ca533140878b9693d3a3e1e39ad1f9 (commit)
      from  d940cf045c4e777d37b19ee4639623f2c4a7e062 (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=1616111f67ca533140878b9693d3a3e1e39ad1f9


commit 1616111f67ca533140878b9693d3a3e1e39ad1f9
Author: Norihiro Tanaka <address@hidden>
Date:   Sat Jul 18 22:27:56 2015 -0700

    tests: sjis-mb: accept two more locales
    
    * tests/sjis-mb: Accept the ja_JP.SJIS and ja_JP.PCK locales
    as well as ja_JP.SHIFT_JIS, so this test is less likely to
    be skipped unnecessarily.  Reported as http://bugs.gnu.org/18983

diff --git a/tests/sjis-mb b/tests/sjis-mb
index 63f0ad9..39459fe 100755
--- a/tests/sjis-mb
+++ b/tests/sjis-mb
@@ -11,8 +11,6 @@ path_prepend_ .
 require_compiled_in_MB_support
 require_timeout_
 
-locale=ja_JP.SHIFT_JIS
-
 # Sequences used in this test ("%" and "@" become 8-bit characters, while "A"
 # is the real ASCII character for "A"):
 # - "%" becomes an half-width katakana in SJIS, but it is an invalid sequence
@@ -23,6 +21,11 @@ locale=ja_JP.SHIFT_JIS
 
 encode() { echo "$1" | tr @% '\203\301'; }
 
+for locale in ja_JP.SHIFT_JIS ja_JP.SJIS ja_JP.PCK ''; do
+  test "$(get-mb-cur-max $locale)" = 2 && break
+done
+test -n "$locale" || skip_ 'SJIS locale not found'
+
 k=0
 test_grep_reject() {
   k=$(expr $k + 1)
@@ -40,8 +43,6 @@ test_grep() {
   test $? = 0 && compare exp$k out$k
 }
 
-test "$(get-mb-cur-max $locale)" = 2 || skip_ 'SJIS locale not found'
-
 address@hidden
 successful_tests='%%AA @AA @A@@A'
 

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

Summary of changes:
 tests/sjis-mb |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
grep