Final changes

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

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index b2158e6fda86ebc1302f0254ec2e82afecff46a1..65edb56c2dadcec3d1293080fd1479e16c1444b8 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -9,8 +9,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+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 " "
@@ -32,6 +35,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 echo "Backup 1 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o
@@ -50,6 +54,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 echo "Backup 2 done"
 touch ${cwd}/build/src/dird/*.c
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
@@ -66,6 +71,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 echo "Backup 3 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
@@ -82,26 +88,31 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 echo "Backup 4 done"
 # 
 # now do several restores to ensure we cleanup between jobs
 #
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?