ITS#9931 test scripts: fix BSD vs GNU date syntax

diff --git a/tests/scripts/all b/tests/scripts/all
index a4808f43586bc0402cc61e54eed71c8d2d98c2cd..c9528ee0a4c204affca447b0ca59b44f3423c36a 100755 (executable)
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -25,6 +25,15 @@ FAILCOUNT=0
 SKIPCOUNT=0
 SLEEPTIME=10
 
+# check for BSD vs GNU date
+date -j >/dev/null 2>&1
+RC=$?
+if [ $RC -ne 0 ]; then
+       DATEOPT="-d @"
+else
+       DATEOPT="-r "
+fi
+
 echo ">>>>> $(timer) Executing all LDAP tests for $BACKEND"
 
 if [ -n "$NOEXIT" ]; then

diff --git a/tests/scripts/functions.sh b/tests/scripts/functions.sh
index c10dfebc44f675fc62a2b69aac1d78a054ba192d..7e6615fff9ce6c766cb6c665f0718c62a8e2e8cd 100755 (executable)
--- a/tests/scripts/functions.sh
+++ b/tests/scripts/functions.sh
@@ -15,6 +15,8 @@
 
 timer() {
        if [ -n "$STARTTIME" ]; then
-               date -u -d "now - $STARTTIME sec" +%T
+               now=`date +%s`
+               delta=`expr $now - $STARTTIME`
+               date -u $DATEOPT$delta +%T
        fi
 }