Updates

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

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index f1fc0443c684d0fc68ba4b628cfd3f5deb0a4798..9b21deae3c82972f03dddcc71f8d18bf04ff15b1 100644 (file)
--- 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 d91c681b5a32783cc124ee6bebb311838f1f51a4..a08161757b1a5a79fa389f3cd3b730b46b489aa2 100755 (executable)
--- 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 8dd41ea755b44ff1cdcf6e150c9ea24f97220472..086f28aa5231f002095458732def5f1c49f39c79 100755 (executable)
--- a/regress/tests/incremental-2tape
+++ b/regress/tests/incremental-2tape
@@ -42,8 +42,8 @@ cat <<END_OF_DATA >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 a9bedc5a74ec8ede9135e249aff06b1ee87d0f8f..f6fdd9daeb0aad507d1756dd0eae33b6d1edbba7 100755 (executable)
--- 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 <<END_OF_DATA >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