Add new tape tests

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

diff --git a/regress/all-non-root-tape-tests b/regress/all-non-root-tape-tests
index 25f55b09d9d1fda9e8c561df81f9c65f2d242363..13fffb0056d9ae0e8d55441745ded4a8af0d62a1 100755 (executable)
--- a/regress/all-non-root-tape-tests
+++ b/regress/all-non-root-tape-tests
@@ -5,6 +5,7 @@
 tests/test0
 tests/backup-bacula-tape
 tests/small-file-size-tape
+tests/two-volume-tape
 echo " "
 echo " "
 echo "Test results"

diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index 6dfa11b3485b7f61e40a55b205a297c2ba89b7a4..17676e51a26c319ed5ffdf4c62f2914c1ab9b638 100755 (executable)
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -21,8 +21,7 @@ echo " === Starting Small File Size test ==="
 echo " === Starting Small File Size test ===" >>working/log
 echo " "
 
-#bin/bacula start 2>&1 >/dev/null
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index 535fa509a582320126a77093ec9c494d249a003a..49c3355680df2947f4de7f7d8f65f99f02f46ce7 100755 (executable)
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -29,12 +29,11 @@ echo " === Starting Two Volume Tape test ==="
 echo " === Starting Two Volume Tape test ===" >>working/log
 echo " "
 
-#bin/bacula start 2>&1 >/dev/null
-bin/bacula start
+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=DDS-4 volume=TestVolume001 slot=1
 label storage=DDS-4 volume=TestVolume002 slot=2
 update Volume=TestVolume001 MaxVolBytes=3000000
@@ -44,7 +43,7 @@ messages
 @# 
 @# now do a restore
 @#
-@tee    tmp/log2.out
+@output tmp/log2.out
 restore current all
 yes
 wait