Update

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

diff --git a/regress/scripts/copy-2drive-confs b/regress/scripts/copy-2drive-confs
index d25a351fa2721fed1ed1c512c907312967594c98..1f5c3475a2f09125c7a4d629133c0df8447815fe 100755 (executable)
--- a/regress/scripts/copy-2drive-confs
+++ b/regress/scripts/copy-2drive-confs
@@ -7,4 +7,3 @@ outf="tmp/sed_tmp"
 echo "s%# Autochanger = yes%  Autochanger = yes%g" >${outf}
 cp bin/bacula-dir.conf tmp/1
 sed -f ${outf} tmp/1 >bin/bacula-dir.conf
-touch bin/tape_options

diff --git a/regress/scripts/copy-2tape-confs b/regress/scripts/copy-2tape-confs
index a08161757b1a5a79fa389f3cd3b730b46b489aa2..587e5ff1d32ef1c8ee97c5a8a1d6094a1f0b6016 100755 (executable)
--- a/regress/scripts/copy-2tape-confs
+++ b/regress/scripts/copy-2tape-confs
@@ -7,4 +7,3 @@ outf="tmp/sed_tmp"
 echo "s%# Autochanger = yes%  Autochanger = yes%g" >${outf}
 cp bin/bacula-dir.conf tmp/1
 sed -f ${outf} tmp/1 >bin/bacula-dir.conf
-touch bin/tape_options

diff --git a/regress/scripts/copy-tape-confs b/regress/scripts/copy-tape-confs
index b9565193ca2b17e977d903d9b1603105d418474f..588dddc35b1b2c7eb5a9ad85d926f05bfc4f9023 100755 (executable)
--- a/regress/scripts/copy-tape-confs
+++ b/regress/scripts/copy-tape-confs
@@ -3,4 +3,3 @@
 /bin/cp -f scripts/bacula-sd-tape.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
-touch bin/tape_options

diff --git a/regress/scripts/copy-win32-confs b/regress/scripts/copy-win32-confs
index 61483fa15f21027f55b9808a00b7e9e6ef886969..fa698a3ceb022aff1d56e029ca5f94c9392a439f 100755 (executable)
--- a/regress/scripts/copy-win32-confs
+++ b/regress/scripts/copy-win32-confs
@@ -3,4 +3,3 @@
 /bin/cp -f scripts/win32-bacula-sd-tape.conf bin/bacula-sd.conf
 /bin/cp -f scripts/win32-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
-touch bin/tape_options

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index 1c6f5826c9a2e62fc8f2c269f101952d4539504a..bb9272d416acc52f3b270fb5692c7f107ec4d3a7 100755 (executable)
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -40,25 +40,25 @@ status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
-sleep 1
+@sleep 1
 status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
-sleep 1
+@sleep 1
 status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
-sleep 1
+@sleep 1
 status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
-sleep 1
+@sleep 1
 status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
@@ -73,6 +73,7 @@ messages
 restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait
+list volumes
 messages
 END_OF_DATA
 
@@ -95,16 +96,20 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
+list volumes
 run job=NightlySave yes
 wait
+list volumes
 messages
 @# 
 @# now do a second restore
 @#
 @$out tmp/log2.out
+list volumes
 restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait
+list volumes
 messages
 @$out
 quit

diff --git a/regress/tests/two-pool-tape b/regress/tests/two-pool-tape
index 62f9837bed43edceea02ba99fc8eda9fcb5604ca..365e6d623e71500e0f4de651208b27ed3c25827b 100755 (executable)
--- a/regress/tests/two-pool-tape
+++ b/regress/tests/two-pool-tape
@@ -18,7 +18,7 @@ scripts/cleanup
 scripts/copy-2tape-confs
 scripts/prepare-two-tapes
  
-# Make a relatively large backup set 20 x source code directory
+# Make a relatively large backup set 50 x source code directory
 echo "${cwd}/build" >/tmp/file-list
 echo "${cwd}/build" >>/tmp/file-list
 echo "${cwd}/build" >>/tmp/file-list
@@ -39,6 +39,36 @@ echo "${cwd}/build" >>/tmp/file-list
 echo "${cwd}/build" >>/tmp/file-list
 echo "${cwd}/build" >>/tmp/file-list
 echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
+echo "${cwd}/build" >>/tmp/file-list
 
 echo " "
 echo " "