grep branch, master, updated. v2.18-147-g3b301a7

[Paul Eggert]

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  3b301a71d94eec362f00905be9d2fa2b044f6f83 (commit)
      from  ebf3c011c0e7d2af61c2b463ca49b1c3f1331304 (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=3b301a71d94eec362f00905be9d2fa2b044f6f83


commit 3b301a71d94eec362f00905be9d2fa2b044f6f83
Author: Paul Eggert <address@hidden>
Date:   Thu May 15 09:36:57 2014 -0700

    tests: port mb-non-UTF8-performance to RHEL 6.5
    
    * tests/mb-non-UTF8-performance (timeout): Use an integer,
    as 'timeout 1.234' doesn't work in EUC locales.

diff --git a/tests/mb-non-UTF8-performance b/tests/mb-non-UTF8-performance
index 4ce3271..b6d43da 100755
--- a/tests/mb-non-UTF8-performance
+++ b/tests/mb-non-UTF8-performance
@@ -32,7 +32,11 @@ stop=$(hi_res_time_)
 
 # Use a multiple of the LC_ALL=C duration as the timeout for the JP/EUC test.
 # A multiple of 3 seems to be enough for i5,i7, but AMD needs >25.
-timeout=$($AWK 'BEGIN { print 30 * ('$stop' - '$start')}' < /dev/null)
+# Use an integer; some 'timeout' implementations have trouble with
+# floating-point in JP_EUC locales.
+timeout=$(
+  $AWK 'BEGIN { print 1 + int (30 * ('$stop' - '$start'))}' < /dev/null
+)
 
 test $st = 1 || fail=1
 

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

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


hooks/post-receive
-- 
grep