tests: measure time with elapsed time instead of user-mode time

This will help to identify where the real elapsed time is going.

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/misc/jenkins/unitrun.sh b/misc/jenkins/unitrun.sh
index dce0047..c6cd72a 100755 (executable)
--- a/misc/jenkins/unitrun.sh
+++ b/misc/jenkins/unitrun.sh
@@ -25,12 +25,12 @@ name=$1
 shift
 
 # Detect a working time command
-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"
+if env time --quiet -f%e true 2>/dev/null; then
+       TIME="env time --quiet -f%e -o ${name}.t.out"
+elif env time -f%e true 2>/dev/null; then
+       TIME="env time -f%e -o ${name}.t.out"
+elif env gtime -f%e true 2>/dev/null; then
+       TIME="env gtime -f%e -o ${name}.t.out"
 else
        TIME=
 fi

diff --git a/tests/tests.sh b/tests/tests.sh
index e413069..8faa4f6 100755 (executable)
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -130,12 +130,12 @@ else
 fi
 
 # Detect a working time command
-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"
+if env time --quiet -f%e true 2>/dev/null; then
+       TIME="env time --quiet -f%e"
+elif env time -f%e true 2>/dev/null; then
+       TIME="env time -f%e"
+elif env gtime -f%e true 2>/dev/null; then
+       TIME="env gtime -f%e"
 else
        TIME=
 fi