From e8dc1a89a64f8b7476277c1225a6a4602e14afd4 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 19 Nov 2005 14:41:28 +0000 Subject: [PATCH] Update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2599 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/copy-2drive-confs | 1 - regress/scripts/copy-2tape-confs | 1 - regress/scripts/copy-tape-confs | 1 - regress/scripts/copy-win32-confs | 1 - regress/tests/backup-bacula-tape | 13 +++++++++---- regress/tests/two-pool-tape | 32 ++++++++++++++++++++++++++++++- 6 files changed, 40 insertions(+), 9 deletions(-) diff --git a/regress/scripts/copy-2drive-confs b/regress/scripts/copy-2drive-confs index d25a351fa2..1f5c3475a2 100755 --- 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 a08161757b..587e5ff1d3 100755 --- 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 b9565193ca..588dddc35b 100755 --- 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 61483fa15f..fa698a3ceb 100755 --- 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 1c6f5826c9..bb9272d416 100755 --- 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 <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 62f9837bed..365e6d623e 100755 --- 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 " " -- 2.39.5