X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fsparse-test;h=38d12fd9989e4d83a5e96944376fcaad79274eb0;hb=7db9b96e131be6ca1537a142d6af9fcd20a87848;hp=9adab766b6380da3d6ca36cac268f98be08a11fb;hpb=e54ed58d45a9f0ab037c477294a66e95ffc4373b;p=bacula%2Fbacula

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 9adab766b6..38d12fd998 100755
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -3,30 +3,28 @@
 # Run a simple backup of the Bacula build directory using the Sparse option
 #   then restore it.
 #
-cwd=`pwd`
-scripts/copy-test-confs
+TestName="sparse-test"
+JobName=SparseTest
+. scripts/functions
+
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-echo " "
-echo " "
-echo " === Starting sparse-test `date +%R:%S` ==="
-echo " === Starting sparse-test `date +%R:%S` ===" >>working/log
-echo " "
+start_test
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+cat >${cwd}/tmp/bconcmds <<END_OF_DATA
 @output /dev/null
 messages
-@output tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File volume=TestVolume001
-run job=SparseTest yes
+run job=$JobName yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -37,28 +35,11 @@ messages
 @output
 quit
 END_OF_DATA
-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
-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 "  !!!!! sparse-test Bacula source failed!!! !!!!! "
-   echo "  !!!!! sparse-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 "  ===== sparse-test Bacula source OK ===== "
-   echo "  ===== sparse-test OK ===== " >>test.out
-   scripts/cleanup
-fi
+
+run_bacula
+check_for_zombie_jobs storage=File 
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test