Update for new restore

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

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index e4cd2ba5e446403a229a144ab00dd96f9035c909..ec34dddb81446354878af534e2459d26e66dd4b1 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
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
 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
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
 yes
 wait
 messages

diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index 908a9660423067a3a388f3da0c8c492585bf9c2d..0587542625c31a4c783e5af029aa247fc2563b26 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
+restore where=${cwd}/tmp/bacula-restores select all storage=File1
 no
 wait
 messages

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

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index 7cfb20c703633de7de50a40d358fd275d0bd4034..adee285f2b13406554db831781bb843469131e56 100755 (executable)
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -38,7 +38,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select
+restore where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 cd ${cwd}/build/src/cats
 mark *

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 6ed16f3d13fa81d95e6d1e5e81769281f64fc9f0..7857b00bf5d0b56b4c82577835f8c9c9b7ea38bd 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -35,7 +35,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 storage=File
 yes
 wait
 messages

diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index 28a1fa1ba4294f525f816b6df1750b3a324f2bf5..99bb1cd186ccd40a3f15e2b656913c6efe5a4f69 100755 (executable)
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -51,7 +51,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 storage=File
 yes
 wait
 messages

diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape
index 400d3fda8841d5573354684ae4a45f1f8cbcc400..98d91a26e109b43230392835fd84562c94295691 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-tape
+++ b/regress/tests/four-concurrent-jobs-tape
@@ -40,7 +40,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 storage=DDS-4
 yes
 wait
 messages

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index e33e8c1cdd6bc8c1a7cecd4390cb2b90543859ac..a0f2b0330862fe852a4cd312ac2eb7ae52bf353a 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -50,7 +50,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 storage=File1
 yes
 wait
 messages

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index d283a33174a5b9732b431895bfc80fd1cfef6c92..30f42fbca6d6e87209a5809b5e9d7124167535f8 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -91,14 +91,14 @@ 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 storage=File
 yes
 wait
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 messages

diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index c8b0bd731fc277d8b6e5696eb094a22c22883d81..278766a36cd01b2209d290917470f2988833fdba 100755 (executable)
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -53,7 +53,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores 
+restore where=${cwd}/tmp/bacula-restores storage=DDS-4
 7
 <${cwd}/tmp/restore-list
 

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index 0c442894e1c4cb27964ab64c36c10e21b31748cd..375d7dad77a680e5c72a1c339a66f460728e2485 100755 (executable)
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -53,10 +53,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores 
-7
-<${cwd}/tmp/restore-list
-
+restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list
 yes
 wait
 messages

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index 8f853e4d1f3b9050cfd2f7af46382bd5cfe82a5b..f21171b8a4e4b5261261ca3a524bf21c7d41571b 100755 (executable)
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -66,7 +66,7 @@ list volumes
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File1
 yes
 wait
 messages

diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index 9b2d82bd79cacd256461dfceece6ebdb0d7280ed..f8dd658c3a79a53db78d9f4f4b66e48b3d0b9e3f 100755 (executable)
--- a/regress/tests/restore-by-file-tape
+++ b/regress/tests/restore-by-file-tape
@@ -39,10 +39,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores
-7
-<${cwd}/tmp/restore2-list
-
+restore where=${cwd}/tmp/bacula-restores storage=DDS-4 file=<${cwd}/tmp/restore2-list
 yes
 wait
 messages

diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 101a9421dd3e410bca6c573614d81ba2b2fada8d..b120c6715d9f748cf403b37d0fd0066337ce300c 100755 (executable)
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -41,7 +41,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores 
+restore where=${cwd}/tmp/bacula-restores storage=File
 7
 <${cwd}/tmp/restore-list
 

diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index 142ebb71436c56e4dfb1d6ddd9c0053711258ddc..acf8a457bedb442d34cd37dd951d1818faf34010 100755 (executable)
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -34,10 +34,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores
-7
-<${cwd}/tmp/restore2-list
-
+restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore2-list
 yes
 wait
 messages

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 121609e89a646cb6d0a9600af468f14a32837088..4b076d198b7a2b22645dd4413ab969ed0535ea07 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -41,7 +41,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 storage=File
 yes
 wait
 messages

diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index 4b3d327ef9cd52d510f90243df8a7a88b327610c..497b1b539f3a585d9b2f96f0638eef0eca4d95eb 100755 (executable)
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -35,7 +35,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 storage=DDS-4
 yes
 wait
 messages

diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index 35ae3fa11b80ab461f55bb00783f5a93e514fcfa..36d52e014809905bcc8a66323dd66279dcfb7fad 100755 (executable)
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -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 storage=File1
 yes
 wait
 messages

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 8542ba0f9bc91bd7af70c20428e3ebf35431d747..1c28061a714376b31e9deb4becd4a4e20269e395 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
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 messages

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 0943b03fe2f5eecf43fba8902df1a557dae5d667..ca44e623f15d7fc19c2bddc8ae2e0d660ee6214c 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 all
+restore where=${cwd}/tmp/bacula-restores select all storage=File 
 yes
 wait
 messages

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index bb09dd69ce4b2754f33e86223eab77d3c7eb1599..13c6a6297e234c116519c53b7431c29852d7ccba 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -51,14 +51,14 @@ messages
 @# now do several restores to ensure we cleanup between jobs
 @#
 @output /dev/null
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 messages

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index bb5f73f36710eced476af3a7ee915d5829da5755..3149a628ce382f9aadc3041137a1a26cea300ea6 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
+restore where=${cwd}/tmp/bacula-restores select all storage=File1
 yes
 wait
 messages

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index 34012aa4e172981c9c0664e152599e6bb60427e5..a212dc374859c8faf249d439e34f447f895ea389 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
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
 yes
 wait
 messages

diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root
index 12caac0d527f8004b3663b30f2ab401eb1fa1682..f5f87eab2797d07b838149a0a477774d72a03d5a 100755 (executable)
--- a/regress/tests/usr-tape-root
+++ b/regress/tests/usr-tape-root
@@ -21,9 +21,9 @@ echo " "
 echo " "
 bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@tee /dev/null
+@output /dev/null
 messages
-@tee tmp/log1.out
+@output tmp/log1.out
 label storage=DDS-4 Volume=TestVolume001 slot=0
 run job=NightlySave yes
 wait
@@ -31,12 +31,12 @@ messages
 @# 
 @# now do a restore
 @#
-@tee tmp/log2.out
+@output tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select all
 yes
 wait
 messages
-@tee
+@output
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 73a9bea3311f7906c88bf1cd9dbccb035ae1b582..387fa3763eb076c56b55c394affbfead01a3b984 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -40,7 +40,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 storage=File
 yes
 wait
 messages

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 35d03a4cb4db3250e4c96b5f3a73dd1d32c1edeb..755525c346870806f2028274e2d6ea955e7598ea 100755 (executable)
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -56,7 +56,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=
+restore where= storage=File
 5
 done
 yes