Misc

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

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 3e81db61a082940abb9d9b97eeb89f7360a894ef..dfda3bcccdcb5cde9bde341243c8f30bf51f983f 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -13,41 +13,40 @@ bin/make_sqlite_tables
 echo " "
 echo " "
 echo " === Starting Backup Bacula Test ==="
-echo " === Starting Backup Bacula Test ===" >>tmp/log
+echo " === Starting Backup Bacula 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=NightlySave
-yes
+@output tmp/log1.out
+label volume=TestVolume001
+run job=Client1 yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-restore
-5
-done
+@output tmp/log2.out  
+restore where=${cwd}/tmp/bacula-restores current all
 yes
-@sleep 1
 wait
-@output /dev/null
 messages
+@output
 quit
 END_OF_DATA
-sleep 2
-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 2>&1 >/dev/null
+if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== Backup Bacula Test failed!!! ===== "
-   echo "  ===== Backup Bacula Test failed!!! ===== " >>test.out
+   echo "  !!!!! Backup Bacula Test failed!!! !!!!! "
+   echo "  !!!!! Backup Bacula Test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== Backup Bacula Test OK ===== "