From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 28 May 2017 13:02:18 +0000 (+0200)
Subject: Tweak more regress debug for FreeBSD
X-Git-Tag: Release-7.9.1~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=42378de243feaf6a124d691f5d266e061079d03e;p=bacula%2Fbacula

Tweak more regress debug for FreeBSD
---

diff --git a/regress/tests/console-dotcmd-test b/regress/tests/console-dotcmd-test
index 98f2238cd1..2fe5b3a4a9 100755
--- a/regress/tests/console-dotcmd-test
+++ b/regress/tests/console-dotcmd-test
@@ -82,7 +82,7 @@ sed s/log/logerr/ $tmp/bconcmds > $tmp/bconcmds.err
 # With DNS errors, it will take more times
 (run_bconsole $tmp/bconcmds.err)&
 
-sleep 2
+sleep 10
 
 cat <<EOF > $tmp/bconcmds.sametime
 @out /dev/null
@@ -96,10 +96,15 @@ EOF
 run_bconsole $tmp/bconcmds.sametime
 
 wait
+sleep 10
 
 $bperl -e '(-M "$tmp/logsametime.done" < -M "$tmp/logerr.done") && exit 1'
 if [ $? -ne 0 ]; then
     print_debug "ERROR: The timestamp of $tmp/logsametime.done should be smaller than $tmp/logerr.done"
+    echo "logsametime.done"
+    cat $tmp/logsametime.done
+    echo "logerr.done"
+    cat $tmp/logerr.done
     estat=1
 fi
 
diff --git a/regress/tests/file-span-vol-test b/regress/tests/file-span-vol-test
index e8b6ba3e2b..04a2e0bd22 100755
--- a/regress/tests/file-span-vol-test
+++ b/regress/tests/file-span-vol-test
@@ -25,6 +25,7 @@ start_test
 
 # Remove last / and convert all / to cd commands
 CD=`echo $tmp | sed 's:/$::' | sed 's:/:\ncd :g'`
+echo "CD=${CD}"
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
diff --git a/regress/tests/maxtime-test b/regress/tests/maxtime-test
index 14715fec8a..4c34864758 100755
--- a/regress/tests/maxtime-test
+++ b/regress/tests/maxtime-test
@@ -101,10 +101,12 @@ then
     [ "$debug" = 1 ] && echo MAXRUNTIME ok
 else
    echo "MAXRUNTIME in error"
+   echo "${cwd}/tmp/RUN_MAXTIME.log"
+   cat ${cwd}/tmp/RUN_MAXTIME.log
    bstat=1
 fi
 
-grep 'Termination: *Backup OK' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null
+grep -e 'Termination: *Backup OK' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null
 if [ $? -eq 0 ]
 then
     [ "$debug" = 1 ] && echo MAXRUNTIME2 ok