X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fverify-vol-test;h=2df75d62f815b8669fb8f72a4b85e6b542b0becf;hb=a752597b2a79ba0f2dfb0ec6b6da8403464e092b;hp=d6c6a9fc60eb776f07f0f8667f6a27d8915de376;hpb=8f1e1f0f702f5a3b0a11e825c681ef35e69d31fd;p=bacula%2Fbacula

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index d6c6a9fc60..2df75d62f8 100755
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -3,6 +3,13 @@
 # Run a simple backup of the Bacula build directory
 #   then verify the catalog.           
 #
+debug=0
+if test "$debug" -eq 1 ; then
+  out="tee"
+else
+  out="output"
+fi
+
 cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
@@ -10,15 +17,14 @@ echo "${cwd}/build" >/tmp/file-list
 
 echo " "
 echo " "
-echo " === Starting verify Volume Test ==="
-echo " === Starting verify Volume Test ===" >>working/log
+echo " === Starting verify Volume Test at `date +%R:%S` ==="
+echo " === Starting verify Volume Test at `date +%R:%S` ===" >>working/log
 echo " "
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@output /dev/null
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
 messages
-@output tmp/log1.out
+@$out tmp/log1.out
 setdebug level=1 storage=File sd
 label storage=File volume=TestVolume001
 run job=NightlySave yes
@@ -27,14 +33,23 @@ messages
 @# 
 @# now do a verify volume
 @#
-@output ${cwd}/tmp/original
+@$out ${cwd}/tmp/original
 run job=VerifyVolume
 yes
 wait
 messages
-@output
+@$out
 quit
 END_OF_DATA
+
+if test "$debug" -eq 1 ; then
+  bin/bacula start
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+else
+  bin/bacula start 2>&1 >/dev/null
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
+fi
+
 sleep 2
 scripts/check_for_zombie_jobs storage=File 
 bin/bacula stop 2>&1 >/dev/null