]> git.sur5r.net Git - bacula/bacula/commitdiff
Tweak more regress debug for FreeBSD
authorKern Sibbald <kern@sibbald.com>
Sun, 28 May 2017 13:02:18 +0000 (15:02 +0200)
committerKern Sibbald <kern@sibbald.com>
Sun, 28 May 2017 13:02:18 +0000 (15:02 +0200)
regress/tests/console-dotcmd-test
regress/tests/file-span-vol-test
regress/tests/maxtime-test

index 98f2238cd1c6877c3fe942487eac768cb39967ed..2fe5b3a4a9860473c9e320f9b9c9fe83b77db462 100755 (executable)
@@ -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
 
index e8b6ba3e2b351397b13d7bf1ed2213b78be53617..04a2e0bd22de346403de4cc0a5cee39095ced3ba 100755 (executable)
@@ -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
index 14715fec8a81d1aa1962f135495cb1986985f08f..4c34864758173d64847ebd5a17de9b13b31d3ead 100755 (executable)
@@ -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