From 81351c7ff846df28c3a8d06c8336ab8b973ca214 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 17 Aug 2005 13:25:44 +0000 Subject: [PATCH] Updates git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2320 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/bacula-dir-tape.conf.in | 1 + regress/scripts/copy-2tape-confs | 4 ++++ regress/tests/incremental-2tape | 4 ++-- regress/tests/two-volume-tape | 9 +++++---- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in index f1fc0443c6..9b21deae3c 100644 --- a/regress/scripts/bacula-dir-tape.conf.in +++ b/regress/scripts/bacula-dir-tape.conf.in @@ -95,6 +95,7 @@ Storage { Device = DDS-4 # must be same as Device in Storage daemon Media Type = DDS-4 # must be same as MediaType in Storage daemon Maximum Concurrent Jobs = 4 +# Autochanger = yes } diff --git a/regress/scripts/copy-2tape-confs b/regress/scripts/copy-2tape-confs index d91c681b5a..a08161757b 100755 --- a/regress/scripts/copy-2tape-confs +++ b/regress/scripts/copy-2tape-confs @@ -3,4 +3,8 @@ /bin/cp -f scripts/bacula-sd-2tape.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 +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/tests/incremental-2tape b/regress/tests/incremental-2tape index 8dd41ea755..086f28aa52 100755 --- a/regress/tests/incremental-2tape +++ b/regress/tests/incremental-2tape @@ -42,8 +42,8 @@ cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default +label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 +label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0 run job=NightlySave yes wait messages diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape index a9bedc5a74..f6fdd9daeb 100755 --- a/regress/tests/two-volume-tape +++ b/regress/tests/two-volume-tape @@ -5,7 +5,7 @@ # Note, this test simulates the tape filling and writing to # the next tape. # -debug=0 +debug=1 if test "$debug" -eq 1 ; then out="tee" else @@ -33,9 +33,10 @@ cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default -update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default +label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default drive=0 +label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 +update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default drive=0 +@#setdebug level=1000 client run job=NightlySave yes wait messages -- 2.39.5