Final changes

[bacula/bacula] / regress / tests / weird-files2-test

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index a618c4e4c06b46a26b9caf73c7581a3df059e8d3..b3c5fda96574eb44d73aa8de0e16060fa04d41b6 100755 (executable)
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -12,11 +12,8 @@ cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 rm -rf weird-files2
-cp -a weird-files weird-files2
+cp -Rp weird-files weird-files2
 echo "${cwd}/weird-files2" >/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
 
 echo " "
 echo " "
@@ -26,7 +23,7 @@ echo " "
 
 bin/testls weird-files2 >${cwd}/tmp/original
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -37,6 +34,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File 
 #
 # Now mess up the a hard link, and a soft link
 #
@@ -46,15 +44,17 @@ ln hard-file3 hard-file2
 rm -f soft-file2
 ln -s soft-file3 soft-file2
 cd ${cwd}
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @# 
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=
+restore where= storage=File
 5
+unmark *
+mark *
 done
 yes
 wait
@@ -62,6 +62,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File 
 bin/bacula stop 2>&1 >/dev/null
 bin/testls weird-files2 >${cwd}/tmp/restored
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null