Add more debug to regress for FreeBSD failures

diff --git a/regress/tests/console-dotcmd-test b/regress/tests/console-dotcmd-test
index 2fe5b3a4a9860473c9e320f9b9c9fe83b77db462..8cf74dba0623747e9758506a90092745f9e30149 100755 (executable)
--- a/regress/tests/console-dotcmd-test
+++ b/regress/tests/console-dotcmd-test
@@ -101,11 +101,12 @@ 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
+    stat $tmp/logsametime.done
+    stat $tmp/logerr.done
     estat=1
+else
+    stat $tmp/logsametime.done
+    stat $tmp/logerr.done
 fi
 
 nb=`grep test50-1-fd $tmp/log2.out $tmp/logerr2.out | wc -l`

diff --git a/regress/tests/file-span-vol-test b/regress/tests/file-span-vol-test
index 11cedb346c5350705ea4b0603c72627a49468a1e..a5d012705419c2b0323d3a90d61adc4a0a16066a 100755 (executable)
--- 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=`printf $tmp | sed 's:/$::' | sed 's:/:\ncd :g'`
+echo "CD=${CD}"
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
@@ -47,7 +48,7 @@ messages
 @$out ${cwd}/tmp/log2.out
 restore where=$tmp/bacula-restores select storage=File1
 unmark *
-$CD
+${CD}
 mark big
 done
 yes

diff --git a/regress/tests/verify-data-test b/regress/tests/verify-data-test
index c80c0b794c831d880f4c4484a739eb1165a3a17a..cfcfc3342d0a00f1f5fc9fd3e12d66be7c84a5f6 100755 (executable)
--- a/regress/tests/verify-data-test
+++ b/regress/tests/verify-data-test
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2017 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 #
@@ -61,6 +61,7 @@ stop_bacula
 
 $bperl -e 'add_attribute("$conf/bacula-sd.conf", "BlockChecksum", "no", "Device")'
 
+# Introduce a volume error by modifying the some Volume data
 nbok=2
 if [ x$FORCE_DEDUP = xyes ]; then
     nbok=4
@@ -73,7 +74,9 @@ fi
 cat <<END_OF_DATA >tmp/bconcmds
 @$out tmp/log3.out
 @# 
-@# now do a verify volume with errors
+@# now do a verify volume with errors.  Note, which JobId produces
+@#  verify errors depends on the size of data stored (less with dedup
+@#  and ALIGNED).  
 @#
 @$out ${cwd}/tmp/log3.out
 setdebug level=10 client
@@ -98,14 +101,14 @@ if [ $nb -ne 4 ]; then
 fi
 nb=`grep "^  Termination: *Verify OK" tmp/log2.out | wc -l`
 if [ $nb -ne 4 ]; then
-    rstat=1
+    vstat=1
 fi
 nb=`grep "^  Termination: *Verify OK" tmp/log3.out | wc -l`
 if [ $nb -ne $nbok ]; then
     echo "nb=${nb} nbok=${nbok}"
     echo "tmp/log3.out"
     cat tmp/log3.out
-    rstat=2
+    vstat=2
 fi
 dstat=0
 end_test