Update for all/done restore changes

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

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index 09b6da925d9b899cefca7078e84facb46328eaff..ac2df5d89d559543cdd1ea347b68c33e5cca1866 100755 (executable)
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -34,7 +34,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait
 messages
@@ -52,7 +52,7 @@ messages
 @# now do a second restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait
 messages

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 2d126acd5c98dead33edba6a03923ec826b0fb79..c9f038d1d618a6c13ca4403b6000be20a314ed26 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -32,7 +32,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out  
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages

diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index 314105bca8967fd655ad09f7364dd0fa7c79b550..3bf459dbeff762ca47baf0f14fb222b29ebcbe33 100755 (executable)
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -36,7 +36,7 @@ messages
 @# now build the bsr file
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File1
+restore where=${cwd}/tmp/bacula-restores select all storage=File1 done
 no
 wait
 messages

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index a7d0bf0400d2f263a0047dbee0d978255169432c..164439e1bb0fa30fae44b9c51b0774b7a21a6247 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -61,7 +61,7 @@ messages
 @# 
 @# now do a restore
 @#
-restore where=${cwd}/tmp/bacula-restores select all storage=File1
+restore where=${cwd}/tmp/bacula-restores select all storage=File1 done
 yes
 wait
 messages

diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root
index 67638c1d3628ca5f12569f782aeeeb0eea3279d4..abb7823068f499821e83d0b75336c8c60eacc91f 100755 (executable)
--- a/regress/tests/dev-test-root
+++ b/regress/tests/dev-test-root
@@ -42,7 +42,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages

diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape
index 78ac24d78de274f724d8e143b016ee7b399ee0fb..4b082dbe0e1464586addfc0fe8e40f85f106ee47 100755 (executable)
--- a/regress/tests/four-jobs-tape
+++ b/regress/tests/four-jobs-tape
@@ -93,10 +93,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
+restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 @output tmp/log2.out

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index 3299e33af8be4bb9753883d844abd9e1cd6b0567..65edb56c2dadcec3d1293080fd1479e16c1444b8 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -95,10 +95,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

diff --git a/regress/tests/lib-tape-root b/regress/tests/lib-tape-root
index 87c07a44971f62218a0bc2c744fb34532594067f..8701602d4ea6e85556bc1914e0731fdaef8894b3 100755 (executable)
--- a/regress/tests/lib-tape-root
+++ b/regress/tests/lib-tape-root
@@ -32,7 +32,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 7eacbb2daae4cab449dd4165b60be2e0a3e5215e..1ae38cbba7390b83b56c5c7e8febec6f81dec3ea 100755 (executable)
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -33,7 +33,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out   
-restore where=${cwd}/tmp/bacula-restores select all storage=File
+restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
 messages

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index b040af024446e19994fa0cc9b08c9006f7b5c0ef..40c84b83b06dfa6b904f0ec1f1f1267652c15e8d 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -33,7 +33,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select storage=File 
+restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
 done

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 6bd84cb750f7e4c1e5dc86a56b294617165400e8..2828ea19facf88d4a65204a5c99d2a4adf92e31f 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -55,10 +55,10 @@ messages
 @# now do several restores to ensure we cleanup between jobs
 @#
 @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

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index e58847b2f1a7c77b9d77b6829222febfd3a0f45a..8297135caa4f94fa6aecef277f78d6b312be7b69 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -35,7 +35,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File1
+restore where=${cwd}/tmp/bacula-restores select all storage=File1 done
 yes
 wait
 messages

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index 9494de717ac511d0e09e3e3db29dcac29c13d994..2f603f9ee75685de5dfc63a12c483b8ab8275aad 100755 (executable)
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -39,7 +39,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait
 messages

diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root
index f5f87eab2797d07b838149a0a477774d72a03d5a..b4662bcfa8ae7d7fd0d8cede88e15cf46e337120 100755 (executable)
--- a/regress/tests/usr-tape-root
+++ b/regress/tests/usr-tape-root
@@ -32,7 +32,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 6eb4614ab82752d227cfe412c213bd60b035ecec..00c5fb37342e754fac45b20512272f9868f71ad7 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -48,7 +48,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File
+restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
 messages