grep branch, master, updated. v2.13-6-g8e4b6b3

[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  8e4b6b3901084ce2d347f27073170acd26ac01ae (commit)
       via  ee6edba5edb22151cda7d9ca915a2294c60e952d (commit)
       via  4a2ec35c74e68f9df516ac00ecd616737a28384d (commit)
      from  d8d0bf0895dccf1c541e72f7a75d3cbaf7821a05 (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=8e4b6b3901084ce2d347f27073170acd26ac01ae


commit 8e4b6b3901084ce2d347f27073170acd26ac01ae
Author: Jim Meyering <address@hidden>
Date:   Sat Jul 21 12:54:07 2012 +0200

    tests: avoid false positive upon kernel OOM-kill
    
    * tests/big-match (skip_diagnostic): Handle case of 139 (SIGKILL)
    with no diagnostic.

diff --git a/tests/big-match b/tests/big-match
index 51e0ffd..20928cf 100755
--- a/tests/big-match
+++ b/tests/big-match
@@ -19,7 +19,8 @@ for pattern in '^.*' '^.*x\(\)\1'; do
     0,*) ;;
     2,*': line too long for re_search')
        skip_diagnostic='regular expression library cannot handle the test' ;;
-    2,*': memory exhausted')
+    137,''|2,*': memory exhausted')
+       # The 137/no-diagnostic arises when the kernel OOM-kills grep.
        skip_diagnostic='not enough main memory to run the test' ;;
     *) fail=1 ;;
   esac

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


commit 8e4b6b3901084ce2d347f27073170acd26ac01ae
Author: Jim Meyering <address@hidden>
Date:   Sat Jul 21 12:54:07 2012 +0200

    tests: avoid false positive upon kernel OOM-kill
    
    * tests/big-match (skip_diagnostic): Handle case of 139 (SIGKILL)
    with no diagnostic.

diff --git a/tests/big-match b/tests/big-match
index 51e0ffd..20928cf 100755
--- a/tests/big-match
+++ b/tests/big-match
@@ -19,7 +19,8 @@ for pattern in '^.*' '^.*x\(\)\1'; do
     0,*) ;;
     2,*': line too long for re_search')
        skip_diagnostic='regular expression library cannot handle the test' ;;
-    2,*': memory exhausted')
+    137,''|2,*': memory exhausted')
+       # The 137/no-diagnostic arises when the kernel OOM-kills grep.
        skip_diagnostic='not enough main memory to run the test' ;;
     *) fail=1 ;;
   esac

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


commit 8e4b6b3901084ce2d347f27073170acd26ac01ae
Author: Jim Meyering <address@hidden>
Date:   Sat Jul 21 12:54:07 2012 +0200

    tests: avoid false positive upon kernel OOM-kill
    
    * tests/big-match (skip_diagnostic): Handle case of 139 (SIGKILL)
    with no diagnostic.

diff --git a/tests/big-match b/tests/big-match
index 51e0ffd..20928cf 100755
--- a/tests/big-match
+++ b/tests/big-match
@@ -19,7 +19,8 @@ for pattern in '^.*' '^.*x\(\)\1'; do
     0,*) ;;
     2,*': line too long for re_search')
        skip_diagnostic='regular expression library cannot handle the test' ;;
-    2,*': memory exhausted')
+    137,''|2,*': memory exhausted')
+       # The 137/no-diagnostic arises when the kernel OOM-kills grep.
        skip_diagnostic='not enough main memory to run the test' ;;
     *) fail=1 ;;
   esac

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

Summary of changes:
 ChangeLog-2009  |    4 +-
 bootstrap       |  111 +++++++++++++++++++++++++++++++-----------------------
 gnulib          |    2 +-
 tests/big-match |    3 +-
 4 files changed, 69 insertions(+), 51 deletions(-)


hooks/post-receive
-- 
grep