X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fsparse-test;h=38d12fd9989e4d83a5e96944376fcaad79274eb0;hb=3a3e106aa07b87f4d9cd711e975f622a2b435dd0;hp=4fa9ba4fd8204ce15869bd2010507046c3679ad8;hpb=4ee91493e376603836ad60ae78da1a0e603c9755;p=bacula%2Fbacula

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 4fa9ba4fd8..38d12fd998 100755
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -3,46 +3,43 @@
 # Run a simple backup of the Bacula build directory using the Sparse option
 #   then restore it.
 #
-cwd=`pwd`
+TestName="sparse-test"
+JobName=SparseTest
+. scripts/functions
+
+scripts/cleanup
 scripts/copy-test-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
-echo "${cwd}/build" >/tmp/file-list
-bin/bacula stop 
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
-bin/bacula start
-bin/console -c bin/console.conf <<END_OF_DATA
+echo "${cwd}/build" >${cwd}/tmp/file-list
+
+start_test
+
+cat >${cwd}/tmp/bconcmds <<END_OF_DATA
 @output /dev/null
 messages
-@output
-label
-TestVolume001
-run job=SparseTest
-yes
+@$out ${cwd}/tmp/log1.out
+label storage=File volume=TestVolume001
+run job=$JobName yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-restore
-5
+@$out ${cwd}/tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
 done
 yes
 wait
-@output /dev/null
 messages
+@output
 quit
 END_OF_DATA
-bin/bacula stop
-diff -ur build /tmp/bacula-restores${cwd}/build
-if [ $? != 0 ] ; then
-   echo " "
-   echo " "
-   echo "  ===== sparse-test Bacula source failed!!! ===== "
-   echo "  ===== sparse-test failed!!! ===== " >>test.out
-   echo " "
-else
-   echo "  ===== sparse-test Bacula source OK ===== "
-   echo "  ===== sparse-test OK ===== " >>test.out
-fi
-rm -rf /tmp/bacula-restores
+
+run_bacula
+check_for_zombie_jobs storage=File 
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test