X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ftwo-vol-test;h=15f48ee5b24f32fd013182af366dee528707f12f;hb=70f4723a1094c8c55d7a501ff52c1ff51a3542bf;hp=967cc95936dd640b171d7b7f2d1e4c061f994c60;hpb=513fb27c6ae7faf0be67bc68e3d7d3e326a3da84;p=bacula%2Fbacula

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 967cc95936..15f48ee5b2 100755
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -3,23 +3,17 @@
 # Run a simple backup of the Bacula build directory but 
 #   split the archive into two volumes
 #
-debug=0
-if test "$debug" -eq 1 ; then
-  out="tee"
-else
-  out="output"
-fi
+TestName="two-vol-test"
+JobName=TwoVol
+. 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 two-vol-test at `date +%R:%S` ==="
-echo " === Starting two-vol-test at `date +%R:%S` ===" >working/log
-echo " "
+change_jobname NightlySave $JobName
+start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
@@ -28,7 +22,7 @@ messages
 label storage=File1 volume=TestVolume002
 label storage=File1 volume=TestVolume001
 update Volume=TestVolume002 MaxVolBytes=3000000
-run job=NightlySave storage=File1 yes
+run job=$JobName storage=File1 yes
 wait
 messages
 @# 
@@ -43,36 +37,10 @@ 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
+check_for_zombie_jobs storage=File1
+stop_bacula
 
-scripts/check_for_zombie_jobs storage=File1
-bin/bacula stop 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
-rstat=$?
-diff -r build  tmp/bacula-restores${cwd}/build 2>&1 >/dev/null
-if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
-   echo " "
-   echo " "
-   echo "  !!!!! two-vol-test Bacula source failed!!! !!!!! "
-   echo "  !!!!! two-vol-test failed!!! !!!!! " >>test.out
-   if [ $bstat != 0 -o $rstat != 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 "  ===== two-vol-test Bacula source OK `date +%R:%S` ===== "
-   echo "  ===== two-vol-test OK `date +%R:%S` ===== " >>test.out
-   scripts/cleanup
-fi
+check_two_logs
+check_restore_diff
+end_test