Cleanup tests + test Termination status

[bacula/bacula] / regress / tests / sparse-compressed-test

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index c209aca8ed18c62692e9548bc63bffa29e572ad2..e8513a3f358f188b3f2a3a76c81d4ee784d00289 100755 (executable)
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -17,11 +17,10 @@ echo " === Starting sparse-compressed-test ==="
 echo " === Starting sparse-compressed-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
+@output tmp/log1.out
 label storage=File
 TestVolume001
 run job=SparseCompressedTest
@@ -31,19 +30,22 @@ messages
 @# 
 @# now do a restore
 @#
+@output tmp/log2.out   
 restore
 5
 done
 yes
 wait
-@output /dev/null
 messages
 quit
 END_OF_DATA
-
-bin/bacula stop
+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 ] ; then
+if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
    echo "  ===== sparse-compressed-test Bacula source failed!!! ===== "