X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fsparse-compressed-test;h=bcbb6bfc4deeaeded9652fc907566c8f4e9b2d3b;hb=d1b8404967060594684bb2448fde7f698b27396c;hp=8542ba0f9bc91bd7af70c20428e3ebf35431d747;hpb=bd1975d9d3da8162240c6e2895d1a97a209c7c92;p=bacula%2Fbacula

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 8542ba0f9b..bcbb6bfc4d 100755
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -3,28 +3,22 @@
 # Run a simple backup of the Bacula build directory using the Sparse option
 #   then restore it.
 #
+TestName="sparse-compressed-test"
+JobName=Sparse-conpressed
+. scripts/functions
+set_debug 0
+
 cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
+scripts/copy-test-confs
 echo "${cwd}/build" >/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges 2>&1 >/dev/null
-cd ..
 
-echo " "
-echo " "
-echo " === Starting sparse-compressed-test ==="
-echo " === Starting sparse-compressed-test ===" >>working/log
-echo " "
+start_test
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+cat >tmp/bconcmds <<END_OF_DATA
 @output /dev/null
 messages
-@output tmp/log1.out
+@$out tmp/log1.out
 label storage=File volume=TestVolume001
 run job=SparseCompressedTest yes
 wait
@@ -32,28 +26,19 @@ messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out   
-restore where=${cwd}/tmp/bacula-restores select all
+@$out tmp/log2.out   
+restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
-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-compressed-test Bacula source failed!!! !!!!! "
-   echo "  !!!!! sparse-compressed-test failed!!! !!!!! " >>test.out
-   echo " "
-else
-   echo "  ===== sparse-compressed-test Bacula source OK ===== "
-   echo "  ===== sparse-compressed-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