grep branch, master, updated. v2.25-40-ga2a3df9

[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  a2a3df953a91f898bd94f05a26088ccdc351fb3a (commit)
      from  61e0661e1b086c8933197f498139db26f157b713 (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=a2a3df953a91f898bd94f05a26088ccdc351fb3a


commit a2a3df953a91f898bd94f05a26088ccdc351fb3a
Author: Jim Meyering <address@hidden>
Date:   Fri Aug 5 21:38:30 2016 -0700

    tests/backref-multibyte-slow:: avoid false positive
    
    * tests/backref-multibyte-slow: When redirecting the "fast" LC_ALL=C
    run's output to /dev/null, we got an artificially low timing (of 0),
    due to grep's own stdout-vs-/dev/null optimization.  With an initial
    timing of 0 on that first run, the derived timeout for the UTF-8 run
    (which redirects to a file) would be a mere 1 second.  The fix: also
    redirect that first run's output to a file, not to /dev/null.

diff --git a/tests/backref-multibyte-slow b/tests/backref-multibyte-slow
index d447a4a..05bb62e 100755
--- a/tests/backref-multibyte-slow
+++ b/tests/backref-multibyte-slow
@@ -14,7 +14,7 @@ $AWK 'BEGIN {for (i=0; i<13000; i++) print "aba"}' /dev/null 
> in || fail=1
 # when running in en_US.UTF-8.  Round up to whole seconds, since timeout
 # can't deal with fractional seconds.
 max_seconds=$(LC_ALL=C perl -le 'use Time::HiRes qw(time); my $s = time();
-              system q,grep -E '\''^([a-z]).\1$'\'' in > /dev/null,;
+              system q,grep -E '\''^([a-z]).\1$'\'' in > junk,;
               my $elapsed = time() - $s; print int (1 + 10 * $elapsed)') \
   || { max_seconds=5;
        warn_ "$ME_: warning: no perl? using default of 5s timeout"; }

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

Summary of changes:
 tests/backref-multibyte-slow |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
grep