Minor updates

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1461 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 54a74fc142ed6eb49cb09d928058871da14a6b83..3929bb51c78d35f94f20f41dadd9067c450a6209 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -24,20 +24,31 @@ label storage=File1
 TestVolume002
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
-12
+@#12
 run job=NightlySave level=Full Storage=File1
 yes
+reload
 run job=NightlySave level=Full Storage=File1
 yes
+reload
 run job=NightlySave level=Full Storage=File1
 yes
+reload
 run job=NightlySave level=Full Storage=File1
 yes
+reload
+reload
+reload
+reload
 @sleep 2
 status dir
+reload
 @sleep 5
 messages
+reload
+reload
 wait
+reload
 messages
 @# 
 @# now do a restore
@@ -49,6 +60,8 @@ mark *
 done
 yes
 wait
+reload
+reload
 messages
 @output
 quit

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 5ec98880f2f06bb991cd84eb19a57d34ff68a9a0..3f916251e7641c548c0045dce390a723e3754654 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -26,8 +26,7 @@ echo " === Starting weird filenames test ==="
 echo " === Starting weird filenames test ===" >>working/log
 echo " "
 
-# bin/bacula start 2>&1 >/dev/null
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
@@ -42,7 +41,10 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File done
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
+done
 yes
 wait
 messages

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index b3c5fda96574eb44d73aa8de0e16060fa04d41b6..aea5126b27e34eb55ab775d01685ad1b3e25b3cd 100755 (executable)
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -22,7 +22,8 @@ echo " === Starting weird filenames2 test ===" >>working/log
 echo " "
 
 bin/testls weird-files2 >${cwd}/tmp/original
-bin/bacula start 2>&1 >/dev/null
+bin/bacula start
+# bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages