grep branch, master, updated. v2.6.3-41-g3d452ac

[Paolo Bonzini]

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  3d452ac165ad81982e93c51cafb3bcf8d7c61fc5 (commit)
      from  2936f502f84e238070f5f459f2c52395ddfde158 (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=3d452ac165ad81982e93c51cafb3bcf8d7c61fc5


commit 3d452ac165ad81982e93c51cafb3bcf8d7c61fc5
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 12 07:26:43 2010 +0200

    tests: accept the Debian timeout program
    
    * tests/init.cfg: test timeout with `timeout 10s true'

diff --git a/tests/init.cfg b/tests/init.cfg
index 357b374..baa2b40 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -39,7 +39,7 @@ test "$envvar_check_fail" = 1 && fail_ "failed to unset the 
above envvars"
 
 require_timeout_()
 {
-  ( timeout --version ) > /dev/null 2>&1 \
+  ( timeout 10s true ) > /dev/null 2>&1 \
     || skip_ your system lacks the timeout program
 }
 

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

Summary of changes:
 tests/init.cfg |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
grep