Increase default gnome window size + add \r to token term chars

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

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 8b706ebf9cd3570c79d68560ea5930612172f5c7..f0b3ec8df15104056dee6a32f5a6748e8c4b6638 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -14,39 +14,42 @@ bin/make_sqlite_tables
 echo " "
 echo " "
 echo " === Starting sparse-test ==="
-echo " === Starting sparse-test ===" >>tmp/log
+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 storage=File
-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 ===== "