Merge: OSX use gtime

This could help to track why jenkins runs on osx are so slow

Pull-Request: #2384

diff --git a/misc/jenkins/unitrun.sh b/misc/jenkins/unitrun.sh
index 1c3d39f..dce0047 100755 (executable)
--- a/misc/jenkins/unitrun.sh
+++ b/misc/jenkins/unitrun.sh
@@ -29,6 +29,8 @@ if env time --quiet -f%U true 2>/dev/null; then
        TIME="env time --quiet -f%U -o ${name}.t.out"
 elif env time -f%U true 2>/dev/null; then
        TIME="env time -f%U -o ${name}.t.out"
+elif env gtime -f%U true 2>/dev/null; then
+       TIME="env gtime -f%U -o ${name}.t.out"
 else
        TIME=
 fi

diff --git a/tests/tests.sh b/tests/tests.sh
index 8168d0d..308ff84 100755 (executable)
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -134,6 +134,8 @@ if env time --quiet -f%U true 2>/dev/null; then
        TIME="env time --quiet -f%U"
 elif env time -f%U true 2>/dev/null; then
        TIME="env time -f%U"
+elif env gtime -f%U true 2>/dev/null; then
+       TIME="env gtime -f%U"
 else
        TIME=
 fi
@@ -146,7 +148,7 @@ else
 fi
 
 # Detect a working hostname command
-if hostname --version | grep coreutils >/dev/null 2>&1; then
+if hostname --version 2>&1 | grep coreutils >/dev/null 2>&1; then
        HOSTNAME="hostname"
 else
        HOSTNAME="hostname -s"