Use new restore command args

[bacula/bacula] / regress / tests / two-vol-test

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 3b6fbf044f55d13a604702297c81c58d0839a8ca..d4795a5057c8abc973a482ea9e2c5806039ecffe 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -19,8 +19,9 @@ echo " "
 
 bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
-@output tmp/log1.out
+@output /dev/null
 messages
+@output tmp/log1.out
 label storage=File1
 TestVolume001
 label storage=File1
@@ -37,12 +38,11 @@ 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
+@output
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null
@@ -54,8 +54,8 @@ diff -r build  tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== two-vol-test Bacula source failed!!! ===== "
-   echo "  ===== two-vol-test failed!!! ===== " >>test.out
+   echo "  !!!!! two-vol-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! two-vol-test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== two-vol-test Bacula source OK ===== "