Update and add tests

[bacula/bacula] / regress / tests / four-jobs-test

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index 3299e33af8be4bb9753883d844abd9e1cd6b0567..a312b386e6b1c9ac10bb55f43905ff6c1db9b2e9 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -8,12 +8,6 @@ cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges 2>&1 >/dev/null
-cd ..
 
 echo " "
 echo " "
@@ -95,10 +89,10 @@ echo "Backup 4 done"
 #
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
-restore where=${cwd}/tmp/bacula-restores select all storage=File
+restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
-restore where=${cwd}/tmp/bacula-restores select all storage=File
+restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
 @output tmp/log2.out