Use new restore command args

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

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 74e778aa8bcfe6d9a1aa63ff6408ef3dd1d48a35..a203cd0b94c07e3baadaef892796d208283f86af 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -31,9 +31,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out  
-restore
-5
-done
+restore current all
 yes
 @sleep 1
 wait

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 03cef1028616857eeaa16e0db2295bbe0161634d..006707adf68d419b6f83a20f183ce2700a5fd910 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -60,9 +60,7 @@ messages
 @# 
 @# now do a restore
 @#
-restore where=${cwd}/tmp/bacula-restores
-5
-done
+restore where=${cwd}/tmp/bacula-restores current all
 yes
 wait
 messages

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 6f11b5d0482d85b6bf384398d4fffb0bb0b7b7f3..d4795a5057c8abc973a482ea9e2c5806039ecffe 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -38,9 +38,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores
-5
-done
+restore where=${cwd}/tmp/bacula-restores current all
 yes
 wait
 messages

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 8afcf8ddf0271bc19caa7b536926bb393f0ba281..15caa6559c66789f6cc112fa22505a52a30900cf 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -21,7 +21,7 @@ bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
-@tee    tmp/log1.out
+@output tmp/log1.out
 label storage=File
 TestVolume001
 run job=NightlySave
@@ -31,7 +31,7 @@ messages
 @# 
 @# now do a verify volume
 @#
-@tee    ${cwd}/tmp/original
+@output ${cwd}/tmp/original
 run job=VerifyVolume
 yes
 wait