X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=regress%2Ftests%2Fsparse-test;h=f0b3ec8df15104056dee6a32f5a6748e8c4b6638;hb=0210a5737a7d83b7c020de5c2f657034292ed487;hp=f8128e4ac81d9cce195bac169b86ae8b4600b641;hpb=cac876e743b1fcbf3d9b008bc7a9eab37dc19676;p=bacula%2Fbacula

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index f8128e4ac8..f0b3ec8df1 100755
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -5,51 +5,54 @@
 #
 cwd=`pwd`
 scripts/copy-test-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
+scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
-bin/bacula stop 
+bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
 bin/make_sqlite_tables
 
 echo " "
 echo " "
 echo " === Starting sparse-test ==="
-echo " "
+echo " === Starting sparse-test ===" >>working/log
 echo " "
 
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
-@output
-label
-TestVolume001
-run job=SparseTest
-yes
+@output tmp/log1.out
+label storage=File volume=TestVolume001
+run job=SparseTest yes
 wait
 messages
 @# 
 @# now do a restore
 @#
+@output tmp/log2.out
 restore
 5
 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
+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
+if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== sparse-test Bacula source failed!!! ===== "
-   echo "  ===== sparse-test failed!!! ===== " >>test.out
+   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
+   scripts/cleanup
 fi
-rm -rf /tmp/bacula-restores