grep branch, master, updated. v2.15-14-g1a8b1b3

[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  1a8b1b370eace41be892e9fef041f36b72baeefb (commit)
      from  ba7ecab408cc5beafb93ecde7a9528a08df5afeb (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=1a8b1b370eace41be892e9fef041f36b72baeefb


commit 1a8b1b370eace41be892e9fef041f36b72baeefb
Author: Jim Meyering <address@hidden>
Date:   Sat Dec 21 09:49:44 2013 -0800

    tests: avoid FP failure due to exhausted memory
    
    * tests/long-line-vs-2GiB-read: Don't declare the test "failed"
    when running out of memory.  In that case, skip it.

diff --git a/tests/long-line-vs-2GiB-read b/tests/long-line-vs-2GiB-read
index 773c542..29d29ec 100755
--- a/tests/long-line-vs-2GiB-read
+++ b/tests/long-line-vs-2GiB-read
@@ -16,6 +16,9 @@ dd bs=$MiB seek=2048 of=big < /dev/null || framework_failure_
 echo x >> big || framework_failure_
 grep -l x big > out 2> err || fail=1
 
+# Not everyone has 2GB of memory free.
+grep '^grep: memory exhausted$' err && skip_ 'memory exhausted'
+
 compare exp out || fail=1
 compare /dev/null err || fail=1
 

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

Summary of changes:
 tests/long-line-vs-2GiB-read |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
grep