grep branch, master, updated. v2.25-95-g72aa3b2

[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  72aa3b232e847e8ab78093e87dc1ee6471d192ac (commit)
      from  4a86a5e728ae0152048dd9a65d681f324c8aea17 (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=72aa3b232e847e8ab78093e87dc1ee6471d192ac


commit 72aa3b232e847e8ab78093e87dc1ee6471d192ac
Author: Jim Meyering <address@hidden>
Date:   Thu Sep 22 22:48:46 2016 -0700

    tests: avoid backref-multibyte-slow false failure
    
    * tests/backref-multibyte-slow (max_seconds): If we calculate
    a max duration of 1 second, use 5.  Otherwise, on high-latency
    systems, it would be way too easy for the duration of the final
    test run to exceed that limit.  Reported by Nelson H. F. Beebe.
    http://bugs.gnu.org/24516

diff --git a/tests/backref-multibyte-slow b/tests/backref-multibyte-slow
index 05bb62e..fb012a6 100755
--- a/tests/backref-multibyte-slow
+++ b/tests/backref-multibyte-slow
@@ -19,6 +19,10 @@ max_seconds=$(LC_ALL=C perl -le 'use Time::HiRes qw(time); 
my $s = time();
   || { max_seconds=5;
        warn_ "$ME_: warning: no perl? using default of 5s timeout"; }
 
+# If the above finished so quickly that we'd have a 1-second timeout,
+# increase it to a duration less likely to arise in a parallel test run.
+test $max_seconds = 1 && max_seconds=5
+
 for LOC in en_US.UTF-8; do
   out=out-$LOC
   LC_ALL=$LOC timeout ${max_seconds}s grep -aE '^([a-z]).\1$' in > $out 2>&1

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

Summary of changes:
 tests/backref-multibyte-slow |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
grep