From d6f4c6180cb6f2ab99201b459402d66504c4e5a3 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 13 Dec 2005 18:01:29 +0000 Subject: [PATCH] Updates git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2667 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/all-non-root-tape-tests | 1 + regress/scripts/copy-2drive-confs | 6 ++++ regress/scripts/copy-2tape-confs | 6 ++++ regress/scripts/copy-confs | 6 ++++ regress/scripts/copy-tape-confs | 6 ++++ regress/scripts/copy-test-confs | 6 ++++ regress/scripts/copy-testa-confs | 6 ++++ regress/scripts/copy-win32-confs | 6 ++++ regress/scripts/do_sed | 2 ++ regress/tests/two-pool-tape | 55 ++++--------------------------- 10 files changed, 52 insertions(+), 48 deletions(-) diff --git a/regress/all-non-root-tape-tests b/regress/all-non-root-tape-tests index 5a64aad4c3..8b2527670d 100755 --- a/regress/all-non-root-tape-tests +++ b/regress/all-non-root-tape-tests @@ -15,6 +15,7 @@ tests/relabel-tape tests/restore-by-file-tape tests/small-file-size-tape tests/truncate-bug-tape +tests/two-pool-tape echo " " echo " " echo "Test results" diff --git a/regress/scripts/copy-2drive-confs b/regress/scripts/copy-2drive-confs index 1f5c3475a2..0388c4c175 100755 --- a/regress/scripts/copy-2drive-confs +++ b/regress/scripts/copy-2drive-confs @@ -7,3 +7,9 @@ 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 + +# get proper SD tape definitions +cp -f scripts/linux_tape_options bin/tape_options +if test x`uname` = xFreeBSD ; then + cp -f scripts/freebsd_tape_options bin/tape_options +fi diff --git a/regress/scripts/copy-2tape-confs b/regress/scripts/copy-2tape-confs index 587e5ff1d3..e23adc5c82 100755 --- a/regress/scripts/copy-2tape-confs +++ b/regress/scripts/copy-2tape-confs @@ -7,3 +7,9 @@ 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 + +# get proper SD tape definitions +cp -f scripts/linux_tape_options bin/tape_options +if test x`uname` = xFreeBSD ; then + cp -f scripts/freebsd_tape_options bin/tape_options +fi diff --git a/regress/scripts/copy-confs b/regress/scripts/copy-confs index d1e6cc1c36..c12a20a359 100755 --- a/regress/scripts/copy-confs +++ b/regress/scripts/copy-confs @@ -3,3 +3,9 @@ /bin/cp -f scripts/bacula-sd.conf bin/bacula-sd.conf /bin/cp -f scripts/bacula-fd.conf bin/bacula-fd.conf /bin/cp -f scripts/bconsole.conf bin/bconsole.conf + +# get proper SD tape definitions +cp -f scripts/linux_tape_options bin/tape_options +if test x`uname` = xFreeBSD ; then + cp -f scripts/freebsd_tape_options bin/tape_options +fi diff --git a/regress/scripts/copy-tape-confs b/regress/scripts/copy-tape-confs index 588dddc35b..c8dae32c4a 100755 --- a/regress/scripts/copy-tape-confs +++ b/regress/scripts/copy-tape-confs @@ -3,3 +3,9 @@ /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 + +# get proper SD tape definitions +cp -f scripts/linux_tape_options bin/tape_options +if test x`uname` = xFreeBSD ; then + cp -f scripts/freebsd_tape_options bin/tape_options +fi diff --git a/regress/scripts/copy-test-confs b/regress/scripts/copy-test-confs index 61b120f610..5552c77116 100755 --- a/regress/scripts/copy-test-confs +++ b/regress/scripts/copy-test-confs @@ -3,3 +3,9 @@ /bin/cp -f scripts/test-bacula-sd.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 + +# get proper SD tape definitions +cp -f scripts/linux_tape_options bin/tape_options +if test x`uname` = xFreeBSD ; then + cp -f scripts/freebsd_tape_options bin/tape_options +fi diff --git a/regress/scripts/copy-testa-confs b/regress/scripts/copy-testa-confs index 6b5f30c3ef..46116b9f90 100755 --- a/regress/scripts/copy-testa-confs +++ b/regress/scripts/copy-testa-confs @@ -3,3 +3,9 @@ /bin/cp -f scripts/test-bacula-sd.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 + +# get proper SD tape definitions +cp -f scripts/linux_tape_options bin/tape_options +if test x`uname` = xFreeBSD ; then + cp -f scripts/freebsd_tape_options bin/tape_options +fi diff --git a/regress/scripts/copy-win32-confs b/regress/scripts/copy-win32-confs index fa698a3ceb..7cda59aabc 100755 --- a/regress/scripts/copy-win32-confs +++ b/regress/scripts/copy-win32-confs @@ -3,3 +3,9 @@ /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 + +# get proper SD tape definitions +cp -f scripts/linux_tape_options bin/tape_options +if test x`uname` = xFreeBSD ; then + cp -f scripts/freebsd_tape_options bin/tape_options +fi diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed index 61614122f2..d12990b2d1 100755 --- a/regress/scripts/do_sed +++ b/regress/scripts/do_sed @@ -9,6 +9,7 @@ if test $# != 6 ; then echo " and the sixth must be the smtp or email host" exit 1 fi +mkdir -p ${cwd}/bin out="/tmp/sed_tmp" cwd=`pwd` HOST="localhost" @@ -43,6 +44,7 @@ sed -f ${out} ${cwd}/scripts/cleanup-tape.in >${cwd}/scripts/cleanup-tape sed -f ${out} ${cwd}/scripts/cleanup-2tape.in >${cwd}/scripts/cleanup-2tape sed -f ${out} ${cwd}/scripts/cleanup-2drive.in >${cwd}/scripts/cleanup-2drive sed -f ${out} ${cwd}/scripts/prepare-two-tapes.in >${cwd}/scripts/prepare-two-tapes + cp ${cwd}/bin/bacula-sd.conf /tmp/bac$$ sed s%/tmp%${cwd}/tmp%g /tmp/bac$$ >${cwd}/bin/bacula-sd.conf chmod 777 ${cwd}/scripts/cleanup-*tape ${cwd}/scripts/cleanup-*drive ${cwd}/scripts/prepare-two-tapes diff --git a/regress/tests/two-pool-tape b/regress/tests/two-pool-tape index 38c59e6ea5..3a1cd795a2 100755 --- a/regress/tests/two-pool-tape +++ b/regress/tests/two-pool-tape @@ -7,7 +7,7 @@ # is in /tmp/file-list, which is by default the Bacula # source code (i.e. the build directory). # -debug=1 +debug=0 if test "$debug" -eq 1 ; then out="tee" else @@ -18,57 +18,12 @@ scripts/cleanup scripts/copy-2tape-confs scripts/prepare-two-tapes -# Make a relatively large backup set 50 x source code directory +# Make a relatively large backup set 5 x source code directory 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 "${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 " " @@ -77,7 +32,7 @@ echo " === Starting Two Pool Tape test at `date +%R:%S` ===" >>working/log echo " " # Write out bconsole commands to a file cat <tmp/bconcmds -@$out /dev/null +@output /dev/null messages @$out tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0 @@ -85,10 +40,14 @@ label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 list volumes @# Start job with Client run before and sleep run job=NightlySave1 level=Full pool=Default yes +run job=NightlySave1 level=Full pool=Default yes +run job=NightlySave1 level=Full pool=Default yes @# wait between starting jobs @sleep 60 @#setdebug level=100 storage=DDS-4 run job=NightlySave2 level=Full pool=Full yes +run job=NightlySave2 level=Full pool=Full yes +run job=NightlySave2 level=Full pool=Full yes @sleep 10 messages @sleep 10 -- 2.39.2