From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 27 Mar 2004 10:14:58 +0000 (+0000)
Subject: Update for all/done restore changes
X-Git-Tag: Release-1.34.0~30
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a06cd2b477978cb7cccba36995e0cbdaf35b8dcc;p=bacula%2Fbacula

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 09b6da925d..ac2df5d89d 100755
--- 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 2d126acd5c..c9f038d1d6 100755
--- 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 314105bca8..3bf459dbef 100755
--- 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 a7d0bf0400..164439e1bb 100755
--- 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 67638c1d36..abb7823068 100755
--- 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 78ac24d78d..4b082dbe0e 100755
--- 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 3299e33af8..65edb56c2d 100755
--- 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 87c07a4497..8701602d4e 100755
--- 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 7eacbb2daa..1ae38cbba7 100755
--- 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 b040af0244..40c84b83b0 100755
--- 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 6bd84cb750..2828ea19fa 100755
--- 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 e58847b2f1..8297135caa 100755
--- 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 9494de717a..2f603f9ee7 100755
--- 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 f5f87eab27..b4662bcfa8 100755
--- 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 6eb4614ab8..00c5fb3734 100755
--- 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