Update 2 drive test

[bacula/bacula] / regress / tests / auto-label-test

diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index 347bb8cbcb5fa6198e0481948f5df7f09752569f..2e020e766bacd5a9ef899168fc384d5fc45dad91 100755 (executable)
--- a/regress/tests/auto-label-test
+++ b/regress/tests/auto-label-test
@@ -2,6 +2,13 @@
 #
 #  Test if Bacula can automatically create a Volume label.
 #
+
+debug=0
+if test "$debug" -eq 1 ; then
+  out="tee"
+else
+  out="output"
+fi
 cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
@@ -12,18 +19,17 @@ sed "s%# Label Format%  Label Format%" ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 
 echo " "
 echo " "
-echo " === Starting auto-label-test ==="
-echo " === Starting auto-label-test ===" >>working/log
+echo " === Starting auto-label-test at `date +%R:%S` ==="
+echo " === Starting auto-label-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
 status all
 status all
 list pools
 messages
-@output tmp/log1.out
+@$out tmp/log1.out
 run job=CompressedTest storage=File yes
 list pools
 list volumes
@@ -32,7 +38,7 @@ messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@$out tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -49,15 +55,24 @@ done
 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
+
 scripts/check_for_zombie_jobs storage=File
 
 bin/bacula stop 2>&1 >/dev/null
-grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+grep "^  Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
 diff -r build tmp/bacula-restores${cwd}/build 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then