Fix regexwhere test

[bacula/bacula] / regress / tests / verify-vol-test

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 2df75d62f815b8669fb8f72a4b85e6b542b0becf..88e875ac662fffb7d48d61d9b004d3410e22efdd 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -3,23 +3,17 @@
 # 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
+TestName="verify-vol-test"
+JobName=VerifyVol
+. scripts/functions
 
 cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-echo " "
-echo " "
-echo " === Starting verify Volume Test at `date +%R:%S` ==="
-echo " === Starting verify Volume Test at `date +%R:%S` ===" >>working/log
-echo " "
+change_jobname NightlySave $JobName
+start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
@@ -27,13 +21,14 @@ messages
 @$out tmp/log1.out
 setdebug level=1 storage=File sd
 label storage=File volume=TestVolume001
-run job=NightlySave yes
+run job=$JobName yes
 wait
 messages
 @# 
 @# now do a verify volume
 @#
 @$out ${cwd}/tmp/original
+setdebug level=12 dir
 run job=VerifyVolume
 yes
 wait
@@ -42,35 +37,15 @@ messages
 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
+run_bacula
 
 sleep 2
-scripts/check_for_zombie_jobs storage=File 
-bin/bacula stop 2>&1 >/dev/null
+check_for_zombie_jobs storage=File 
+stop_bacula
+
 grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^  Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null
-if [ $? != 0 -o $bstat != 0 ] ; then
-   echo " "
-   echo " "
-   echo "  !!!!! Verify Volume failed!!! !!!!! "
-   echo "  !!!!! Verify Volume failed!!! !!!!! " >>test.out
-   if [ $bstat != 0 ] ; then
-      echo "  !!!!! Bad Job termination status     !!!!! "
-      echo "  !!!!! Bad Job termination status     !!!!! " >>test.out
-   else
-      echo "  !!!!! Restored files differ          !!!!! "
-      echo "  !!!!! Restored files differ          !!!!! " >>test.out
-   fi
-   echo " "
-else
-   echo "  ===== Verify Volume Test OK ===== "
-   echo "  ===== Verify Volume Test OK ===== " >>test.out
-   scripts/cleanup
-fi
+rstat=$?
+dstat=0
+end_test