grep-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

grep branch, master, updated. v2.8-9-g38cbab6

From: Paolo Bonzini
Subject: grep branch, master, updated. v2.8-9-g38cbab6
Date: Tue, 07 Jun 2011 08:49:09 +0000 
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  38cbab6ec7e851bdb64c68499eda5fc2e680d197 (commit)
       via  4d6cfb9d1c37bbe9175d0baa081e432286cd29c2 (commit)
       via  e9c257e3f193a3eddd4bb76be769fa4c599f1f5c (commit)
      from  c079748fd59d5562633dcc11d971347c58413feb (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=38cbab6ec7e851bdb64c68499eda5fc2e680d197


commit 38cbab6ec7e851bdb64c68499eda5fc2e680d197
Author: Jim Meyering <address@hidden>
Date:   Tue Jun 7 10:25:57 2011 +0200

    tests: fmbtest: factor
    
    * tests/fmbtest: Factor out locale-name duplication.

diff --git a/tests/fmbtest b/tests/fmbtest
index e1e77e0..4e57e28 100755
--- a/tests/fmbtest
+++ b/tests/fmbtest
@@ -7,16 +7,18 @@
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
+cz=cs_CZ.UTF-8
+
 # If cs_CZ.UTF-8 locale doesn't work, skip this test.
-LC_ALL=cs_CZ.UTF-8 locale -k LC_CTYPE 2>/dev/null | grep -q charmap.*UTF-8 \
-  || skip_ this system lacks the cs_CZ.UTF-8 locale
+LC_ALL=$cz locale -k LC_CTYPE 2>/dev/null | grep -q charmap.*UTF-8 \
+  || skip_ this system lacks the $cz locale
 
 # If matching is done in single-byte mode, skip this test too
-printf 'é\n' | LC_ALL=cs_CZ.UTF-8 grep -Eq '^[é]{2}$'
+printf 'é\n' | LC_ALL=$cz grep -Eq '^[é]{2}$'
 case $? in
-  0) Exit 77;;
+  0) skip_test_ this test works only in multibyte mode;;
   1) ;;
-  *) Exit 1;;
+  *) framework_failure_ grep exited with unexpected status $? ;;
 esac
 
 failures=0
@@ -50,21 +52,21 @@ EOF
 
 for mode in F G E; do
 
-test1="$(echo $(LC_ALL=cs_CZ.UTF-8 grep -${mode} -f cspatfile csinput \
+test1="$(echo $(LC_ALL=$cz grep -${mode} -f cspatfile csinput \
                | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
 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=cs_CZ.UTF-8 grep -${mode}i -f cspatfile csinput \
+test2="$(echo $(LC_ALL=$cz grep -${mode}i -f cspatfile csinput \
                | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
 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=cs_CZ.UTF-8 grep -${mode}i -e 'ČÍšE' -e 'Čas' 
csinput \
+test3="$(echo $(LC_ALL=$cz grep -${mode}i -e 'ČÍšE' -e 'Čas' csinput \
                | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
 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"
@@ -72,7 +74,7 @@ if test "$test3" != "01 02 07 08 10 11 12 13 14 15 16 17 18 
19 20"; then
 fi
 
 # Skip the next test - known to fail. TAA.
-#test4="$(echo $(LC_ALL=cs_CZ.UTF-8 grep -${mode}iw -f cspatfile csinput \
+#test4="$(echo $(LC_ALL=$cz grep -${mode}iw -f cspatfile csinput \
 #             | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
 #if test "$test4" != "01 02 08 13 17 19"; then
 #  echo "Test #4 ${mode} failed: $test4"
@@ -82,7 +84,7 @@ fi
 # Test that --color=always does not depend on individual pattern order within 
the pattern
 # list, and that a longer match is preferred to a shorter one starting at the 
same point.
 test6="$(echo 'Cosi tu ČišÍ...' \
-        | LC_ALL=cs_CZ.UTF-8 grep --color=always -${mode}i -e 'čiš' -e 
'čiší')"
+        | LC_ALL=$cz grep --color=always -${mode}i -e 'čiš' -e 'čiší')"
 if echo "$test6" | LC_ALL=C grep -q 'Cosi tu 
.*\[.*m\(.\[K\)\?ČišÍ.*\[.*m\(.\[K\)\?\.\.\.'; then
   :
 else
@@ -93,7 +95,7 @@ fi
 # Test that --color=always does not depend on individual pattern order within 
the pattern
 # list, and that a longer match is preferred to a shorter one starting at the 
same point.
 test7="$(echo 'Cosi tu ČišÍ...' \
-        | LC_ALL=cs_CZ.UTF-8 grep --color=always -${mode}i -e 'čiší' -e 
'čiš')"
+        | LC_ALL=$cz grep --color=always -${mode}i -e 'čiší' -e 'čiš')"
 if echo "$test7" | LC_ALL=C grep -q 'Cosi tu 
.*\[.*m\(.\[K\)\?ČišÍ.*\[.*m\(.\[K\)\?\.\.\.'; then
   :
 else
@@ -105,7 +107,7 @@ done
 
 for mode in G E; do
 
-test8="$(echo $(LC_ALL=cs_CZ.UTF-8 grep -${mode}i -e 'Č.šE' -e 'Č[a-f]s' 
csinput \
+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/'))"
 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"

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=4d6cfb9d1c37bbe9175d0baa081e432286cd29c2


commit 38cbab6ec7e851bdb64c68499eda5fc2e680d197
Author: Jim Meyering <address@hidden>
Date:   Tue Jun 7 10:25:57 2011 +0200

    tests: fmbtest: factor
    
    * tests/fmbtest: Factor out locale-name duplication.

diff --git a/tests/fmbtest b/tests/fmbtest
index e1e77e0..4e57e28 100755
--- a/tests/fmbtest
+++ b/tests/fmbtest
@@ -7,16 +7,18 @@
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
+cz=cs_CZ.UTF-8
+
 # If cs_CZ.UTF-8 locale doesn't work, skip this test.
-LC_ALL=cs_CZ.UTF-8 locale -k LC_CTYPE 2>/dev/null | grep -q charmap.*UTF-8 \
-  || skip_ this system lacks the cs_CZ.UTF-8 locale
+LC_ALL=$cz locale -k LC_CTYPE 2>/dev/null | grep -q charmap.*UTF-8 \
+  || skip_ this system lacks the $cz locale
 
 # If matching is done in single-byte mode, skip this test too
-printf 'é\n' | LC_ALL=cs_CZ.UTF-8 grep -Eq '^[é]{2}$'
+printf 'é\n' | LC_ALL=$cz grep -Eq '^[é]{2}$'
 case $? in
-  0) Exit 77;;
+  0) skip_test_ this test works only in multibyte mode;;
   1) ;;
-  *) Exit 1;;
+  *) framework_failure_ grep exited with unexpected status $? ;;
 esac
 
 failures=0
@@ -50,21 +52,21 @@ EOF
 
 for mode in F G E; do
 
-test1="$(echo $(LC_ALL=cs_CZ.UTF-8 grep -${mode} -f cspatfile csinput \
+test1="$(echo $(LC_ALL=$cz grep -${mode} -f cspatfile csinput \
                | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
 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=cs_CZ.UTF-8 grep -${mode}i -f cspatfile csinput \
+test2="$(echo $(LC_ALL=$cz grep -${mode}i -f cspatfile csinput \
                | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
 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=cs_CZ.UTF-8 grep -${mode}i -e 'ČÍšE' -e 'Čas' 
csinput \
+test3="$(echo $(LC_ALL=$cz grep -${mode}i -e 'ČÍšE' -e 'Čas' csinput \
                | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
 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"
@@ -72,7 +74,7 @@ if test "$test3" != "01 02 07 08 10 11 12 13 14 15 16 17 18 
19 20"; then
 fi
 
 # Skip the next test - known to fail. TAA.
-#test4="$(echo $(LC_ALL=cs_CZ.UTF-8 grep -${mode}iw -f cspatfile csinput \
+#test4="$(echo $(LC_ALL=$cz grep -${mode}iw -f cspatfile csinput \
 #             | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
 #if test "$test4" != "01 02 08 13 17 19"; then
 #  echo "Test #4 ${mode} failed: $test4"
@@ -82,7 +84,7 @@ fi
 # Test that --color=always does not depend on individual pattern order within 
the pattern
 # list, and that a longer match is preferred to a shorter one starting at the 
same point.
 test6="$(echo 'Cosi tu ČišÍ...' \
-        | LC_ALL=cs_CZ.UTF-8 grep --color=always -${mode}i -e 'čiš' -e 
'čiší')"
+        | LC_ALL=$cz grep --color=always -${mode}i -e 'čiš' -e 'čiší')"
 if echo "$test6" | LC_ALL=C grep -q 'Cosi tu 
.*\[.*m\(.\[K\)\?ČišÍ.*\[.*m\(.\[K\)\?\.\.\.'; then
   :
 else
@@ -93,7 +95,7 @@ fi
 # Test that --color=always does not depend on individual pattern order within 
the pattern
 # list, and that a longer match is preferred to a shorter one starting at the 
same point.
 test7="$(echo 'Cosi tu ČišÍ...' \
-        | LC_ALL=cs_CZ.UTF-8 grep --color=always -${mode}i -e 'čiší' -e 
'čiš')"
+        | LC_ALL=$cz grep --color=always -${mode}i -e 'čiší' -e 'čiš')"
 if echo "$test7" | LC_ALL=C grep -q 'Cosi tu 
.*\[.*m\(.\[K\)\?ČišÍ.*\[.*m\(.\[K\)\?\.\.\.'; then
   :
 else
@@ -105,7 +107,7 @@ done
 
 for mode in G E; do
 
-test8="$(echo $(LC_ALL=cs_CZ.UTF-8 grep -${mode}i -e 'Č.šE' -e 'Č[a-f]s' 
csinput \
+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/'))"
 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"

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


commit 38cbab6ec7e851bdb64c68499eda5fc2e680d197
Author: Jim Meyering <address@hidden>
Date:   Tue Jun 7 10:25:57 2011 +0200

    tests: fmbtest: factor
    
    * tests/fmbtest: Factor out locale-name duplication.

diff --git a/tests/fmbtest b/tests/fmbtest
index e1e77e0..4e57e28 100755
--- a/tests/fmbtest
+++ b/tests/fmbtest
@@ -7,16 +7,18 @@
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
+cz=cs_CZ.UTF-8
+
 # If cs_CZ.UTF-8 locale doesn't work, skip this test.
-LC_ALL=cs_CZ.UTF-8 locale -k LC_CTYPE 2>/dev/null | grep -q charmap.*UTF-8 \
-  || skip_ this system lacks the cs_CZ.UTF-8 locale
+LC_ALL=$cz locale -k LC_CTYPE 2>/dev/null | grep -q charmap.*UTF-8 \
+  || skip_ this system lacks the $cz locale
 
 # If matching is done in single-byte mode, skip this test too
-printf 'é\n' | LC_ALL=cs_CZ.UTF-8 grep -Eq '^[é]{2}$'
+printf 'é\n' | LC_ALL=$cz grep -Eq '^[é]{2}$'
 case $? in
-  0) Exit 77;;
+  0) skip_test_ this test works only in multibyte mode;;
   1) ;;
-  *) Exit 1;;
+  *) framework_failure_ grep exited with unexpected status $? ;;
 esac
 
 failures=0
@@ -50,21 +52,21 @@ EOF
 
 for mode in F G E; do
 
-test1="$(echo $(LC_ALL=cs_CZ.UTF-8 grep -${mode} -f cspatfile csinput \
+test1="$(echo $(LC_ALL=$cz grep -${mode} -f cspatfile csinput \
                | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
 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=cs_CZ.UTF-8 grep -${mode}i -f cspatfile csinput \
+test2="$(echo $(LC_ALL=$cz grep -${mode}i -f cspatfile csinput \
                | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
 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=cs_CZ.UTF-8 grep -${mode}i -e 'ČÍšE' -e 'Čas' 
csinput \
+test3="$(echo $(LC_ALL=$cz grep -${mode}i -e 'ČÍšE' -e 'Čas' csinput \
                | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
 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"
@@ -72,7 +74,7 @@ if test "$test3" != "01 02 07 08 10 11 12 13 14 15 16 17 18 
19 20"; then
 fi
 
 # Skip the next test - known to fail. TAA.
-#test4="$(echo $(LC_ALL=cs_CZ.UTF-8 grep -${mode}iw -f cspatfile csinput \
+#test4="$(echo $(LC_ALL=$cz grep -${mode}iw -f cspatfile csinput \
 #             | LC_ALL=C sed 's/^.*\([0-9][0-9]\).*$/\1/'))"
 #if test "$test4" != "01 02 08 13 17 19"; then
 #  echo "Test #4 ${mode} failed: $test4"
@@ -82,7 +84,7 @@ fi
 # Test that --color=always does not depend on individual pattern order within 
the pattern
 # list, and that a longer match is preferred to a shorter one starting at the 
same point.
 test6="$(echo 'Cosi tu ČišÍ...' \
-        | LC_ALL=cs_CZ.UTF-8 grep --color=always -${mode}i -e 'čiš' -e 
'čiší')"
+        | LC_ALL=$cz grep --color=always -${mode}i -e 'čiš' -e 'čiší')"
 if echo "$test6" | LC_ALL=C grep -q 'Cosi tu 
.*\[.*m\(.\[K\)\?ČišÍ.*\[.*m\(.\[K\)\?\.\.\.'; then
   :
 else
@@ -93,7 +95,7 @@ fi
 # Test that --color=always does not depend on individual pattern order within 
the pattern
 # list, and that a longer match is preferred to a shorter one starting at the 
same point.
 test7="$(echo 'Cosi tu ČišÍ...' \
-        | LC_ALL=cs_CZ.UTF-8 grep --color=always -${mode}i -e 'čiší' -e 
'čiš')"
+        | LC_ALL=$cz grep --color=always -${mode}i -e 'čiší' -e 'čiš')"
 if echo "$test7" | LC_ALL=C grep -q 'Cosi tu 
.*\[.*m\(.\[K\)\?ČišÍ.*\[.*m\(.\[K\)\?\.\.\.'; then
   :
 else
@@ -105,7 +107,7 @@ done
 
 for mode in G E; do
 
-test8="$(echo $(LC_ALL=cs_CZ.UTF-8 grep -${mode}i -e 'Č.šE' -e 'Č[a-f]s' 
csinput \
+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/'))"
 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"

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

Summary of changes:
 bootstrap.conf |    3 +--
 tests/fmbtest  |   28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
grep
reply via email to
[Prev in Thread] Current Thread [Next in Thread]