grep branch, master, updated. v2.10-55-gaab59eb

[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  aab59eb87d7fade0ca8a0f444f222284eb28694f (commit)
      from  39f04f2768cd6c2a21631349a17597a9fc4de418 (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=aab59eb87d7fade0ca8a0f444f222284eb28694f


commit aab59eb87d7fade0ca8a0f444f222284eb28694f
Author: Jim Meyering <address@hidden>
Date:   Tue Jan 3 22:10:32 2012 +0100

    tests: adjust test to match code, now that --mmap writes to stderr
    
    * tests/ignore-mmap: Separate stdout and stderr; test both.

diff --git a/tests/ignore-mmap b/tests/ignore-mmap
index a6d30ca..8c40868 100755
--- a/tests/ignore-mmap
+++ b/tests/ignore-mmap
@@ -5,12 +5,16 @@
 echo a > in || framework_failure_
 fail=0
 
-grep --mmap a in > out 2>&1 || fail=1
+echo grep: the --mmap option has been a no-op since 2010 > exp
+
+grep --mmap a in > out 2> err || fail=1
 compare out in || fail=1
+compare exp err || fail=1
 
-grep --mmap b in > out 2>&1
+grep --mmap b in > out 2>err
 # Expect no match and no output.
 test $? = 1 || fail=1
 compare /dev/null out || fail=1
+compare exp err || fail=1
 
 Exit $fail

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

Summary of changes:
 tests/ignore-mmap |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep