grep branch, master, updated. v2.18-27-g87acde8

[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  87acde8879f8edbaf95aa1a91147dc1cebffd4a5 (commit)
      from  6e3ea0dd74426fd394225d3f9dc132e40cd92fd2 (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=87acde8879f8edbaf95aa1a91147dc1cebffd4a5


commit 87acde8879f8edbaf95aa1a91147dc1cebffd4a5
Author: Jim Meyering <address@hidden>
Date:   Sun Mar 16 13:45:57 2014 -0700

    tests: avoid false-positive failure on some AMD CPUs
    
    * tests/mb-non-UTF8-performance: Avoid false-positive failure
    when run on certain AMD processors.

diff --git a/tests/mb-non-UTF8-performance b/tests/mb-non-UTF8-performance
index 640d5db..4ce3271 100755
--- a/tests/mb-non-UTF8-performance
+++ b/tests/mb-non-UTF8-performance
@@ -1,5 +1,7 @@
 #!/bin/sh
 # grep-2.17 would take nearly 200x longer to run the command below.
+# The 200x is on an Intel i7-based system.
+# On an AMD FX-4100, it would take up to 2500x longer.
 
 # Copyright 2014 Free Software Foundation, Inc.
 
@@ -29,8 +31,8 @@ LC_ALL=C grep -i foobar in; st=$?
 stop=$(hi_res_time_)
 
 # Use a multiple of the LC_ALL=C duration as the timeout for the JP/EUC test.
-# Typically, a multiple of 3 seems to be enough.
-timeout=$($AWK 'BEGIN { print 8 * ('$stop' - '$start')}' < /dev/null)
+# A multiple of 3 seems to be enough for i5,i7, but AMD needs >25.
+timeout=$($AWK 'BEGIN { print 30 * ('$stop' - '$start')}' < /dev/null)
 
 test $st = 1 || fail=1
 

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

Summary of changes:
 tests/mb-non-UTF8-performance |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep