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

grep branch, master, updated. v2.6.3-82-g565e1ad

From: Jim Meyering
Subject: grep branch, master, updated. v2.6.3-82-g565e1ad
Date: Fri, 27 Aug 2010 08:11:37 +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  565e1ad0e16e11097ceb8ef6402c656bed29db29 (commit)
       via  f68755911cada286c41b88a2e7c8266553df4ab6 (commit)
       via  30af8050e07a78367b8df69c2f3b6836d0d65944 (commit)
      from  ce88edce453696be4226b70b746e13525721b3f0 (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=565e1ad0e16e11097ceb8ef6402c656bed29db29


commit 565e1ad0e16e11097ceb8ef6402c656bed29db29
Author: Paolo Bonzini <address@hidden>
Date:   Sun Aug 15 10:58:00 2010 -0400

    tests: add failing test for grep from a directory
    
    * tests/Makefile.am (TESTS, XFAIL_TESTS): Add grep-dir.
    * tests/grep-dir: New.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c70775b..8fd74ca 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,7 +24,8 @@ LDADD = ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a
 
 # Remove this definition once the failing test passes.
 XFAIL_TESTS = \
-  word-delim-multibyte
+  word-delim-multibyte \
+  grep-dir
 
 TESTS =                                                \
   backref.sh                                   \
@@ -47,6 +48,7 @@ TESTS =                                               \
   fmbtest                                      \
   foad1                                                \
   grep-dev-null                                        \
+  grep-dir                                             \
   help-version                                 \
   ignore-mmap                                  \
   include-exclude                              \
diff --git a/tests/grep-dir b/tests/grep-dir
new file mode 100644
index 0000000..e005525
--- /dev/null
+++ b/tests/grep-dir
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Case-insensitive grep with a 0-size input file would fail in grep up to 2.6.3
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+mkdir a || framework_failure
+
+echo x | grep -f a/; { test $? -gt 1 && test $? -lt 128; } || fail=1
+echo x | grep -if a/; { test $? -gt 1 && test $? -lt 128; } || fail=1
+echo x | grep -Ff a/; { test $? -gt 1 && test $? -lt 128; } || fail=1
+echo x | grep -Fif a/; { test $? -gt 1 && test $? -lt 128; } || fail=1
+
+grep -f a/ < /dev/null; { test $? -gt 1 && test $? -lt 128; } || fail=1
+grep -if a/ < /dev/null; { test $? -gt 1 && test $? -lt 128; } || fail=1
+grep -Ff a/ < /dev/null; { test $? -gt 1 && test $? -lt 128; } || fail=1
+grep -Fif a/ < /dev/null; { test $? -gt 1 && test $? -lt 128; } || fail=1
+
+Exit $fail

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


commit 565e1ad0e16e11097ceb8ef6402c656bed29db29
Author: Paolo Bonzini <address@hidden>
Date:   Sun Aug 15 10:58:00 2010 -0400

    tests: add failing test for grep from a directory
    
    * tests/Makefile.am (TESTS, XFAIL_TESTS): Add grep-dir.
    * tests/grep-dir: New.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c70775b..8fd74ca 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,7 +24,8 @@ LDADD = ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a
 
 # Remove this definition once the failing test passes.
 XFAIL_TESTS = \
-  word-delim-multibyte
+  word-delim-multibyte \
+  grep-dir
 
 TESTS =                                                \
   backref.sh                                   \
@@ -47,6 +48,7 @@ TESTS =                                               \
   fmbtest                                      \
   foad1                                                \
   grep-dev-null                                        \
+  grep-dir                                             \
   help-version                                 \
   ignore-mmap                                  \
   include-exclude                              \
diff --git a/tests/grep-dir b/tests/grep-dir
new file mode 100644
index 0000000..e005525
--- /dev/null
+++ b/tests/grep-dir
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Case-insensitive grep with a 0-size input file would fail in grep up to 2.6.3
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+mkdir a || framework_failure
+
+echo x | grep -f a/; { test $? -gt 1 && test $? -lt 128; } || fail=1
+echo x | grep -if a/; { test $? -gt 1 && test $? -lt 128; } || fail=1
+echo x | grep -Ff a/; { test $? -gt 1 && test $? -lt 128; } || fail=1
+echo x | grep -Fif a/; { test $? -gt 1 && test $? -lt 128; } || fail=1
+
+grep -f a/ < /dev/null; { test $? -gt 1 && test $? -lt 128; } || fail=1
+grep -if a/ < /dev/null; { test $? -gt 1 && test $? -lt 128; } || fail=1
+grep -Ff a/ < /dev/null; { test $? -gt 1 && test $? -lt 128; } || fail=1
+grep -Fif a/ < /dev/null; { test $? -gt 1 && test $? -lt 128; } || fail=1
+
+Exit $fail

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


commit 565e1ad0e16e11097ceb8ef6402c656bed29db29
Author: Paolo Bonzini <address@hidden>
Date:   Sun Aug 15 10:58:00 2010 -0400

    tests: add failing test for grep from a directory
    
    * tests/Makefile.am (TESTS, XFAIL_TESTS): Add grep-dir.
    * tests/grep-dir: New.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c70775b..8fd74ca 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,7 +24,8 @@ LDADD = ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a
 
 # Remove this definition once the failing test passes.
 XFAIL_TESTS = \
-  word-delim-multibyte
+  word-delim-multibyte \
+  grep-dir
 
 TESTS =                                                \
   backref.sh                                   \
@@ -47,6 +48,7 @@ TESTS =                                               \
   fmbtest                                      \
   foad1                                                \
   grep-dev-null                                        \
+  grep-dir                                             \
   help-version                                 \
   ignore-mmap                                  \
   include-exclude                              \
diff --git a/tests/grep-dir b/tests/grep-dir
new file mode 100644
index 0000000..e005525
--- /dev/null
+++ b/tests/grep-dir
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Case-insensitive grep with a 0-size input file would fail in grep up to 2.6.3
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+mkdir a || framework_failure
+
+echo x | grep -f a/; { test $? -gt 1 && test $? -lt 128; } || fail=1
+echo x | grep -if a/; { test $? -gt 1 && test $? -lt 128; } || fail=1
+echo x | grep -Ff a/; { test $? -gt 1 && test $? -lt 128; } || fail=1
+echo x | grep -Fif a/; { test $? -gt 1 && test $? -lt 128; } || fail=1
+
+grep -f a/ < /dev/null; { test $? -gt 1 && test $? -lt 128; } || fail=1
+grep -if a/ < /dev/null; { test $? -gt 1 && test $? -lt 128; } || fail=1
+grep -Ff a/ < /dev/null; { test $? -gt 1 && test $? -lt 128; } || fail=1
+grep -Fif a/ < /dev/null; { test $? -gt 1 && test $? -lt 128; } || fail=1
+
+Exit $fail

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

Summary of changes:
 bootstrap.conf      |    1 +
 src/searchutils.c   |   11 ++++++-----
 src/system.h        |    1 +
 tests/Makefile.am   |    5 ++++-
 tests/grep-dev-null |   20 ++++++++++++++++++++
 tests/grep-dir      |   17 +++++++++++++++++
 6 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 tests/grep-dev-null
 create mode 100644 tests/grep-dir


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