From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 5 Dec 2005 06:34:51 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-1.38.3~43
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1de2d162c868d6c220a56e8ddf515830dc8b0982;p=bacula%2Fbacula

Update


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

diff --git a/regress/kern.conf b/regress/kern.conf
index b50b77d6d9..05ce1ac2e7 100644
--- a/regress/kern.conf
+++ b/regress/kern.conf
@@ -12,7 +12,7 @@ SQLITE_DIR=${HOME}/bacula/depkgs/sqlite
 
 TAPE_DRIVE="/dev/nst0"
 # if you don't have an autochanger set AUTOCHANGER to /dev/null
-AUTOCHANGER="/dev/sg0"
+AUTOCHANGER="/dev/sg3"
 # For two drive tests -- set to /dev/null if you do not have it 
 TAPE_DRIVE1="/dev/nst1"
 
diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index fc5b15b8b2..203cec84c6 100644
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -36,6 +36,7 @@ Job {
   Pool = Default
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
   Maximum Concurrent Jobs = 4
+# Prefer Mounted Volumes = no
   SpoolData = yes
 # Prefer Mounted Volumes = no
 }
diff --git a/regress/tests/2drive-incremental-2tape b/regress/tests/2drive-incremental-2tape
index 5e4200c289..8f69bb30af 100755
--- a/regress/tests/2drive-incremental-2tape
+++ b/regress/tests/2drive-incremental-2tape
@@ -45,11 +45,12 @@ echo " "
 
 # Write out bconsole commands
 cat <<END_OF_DATA >tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @$out tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1
+setdebug level=100 storage=DDS-4
 run job=NightlySave yes
 run job=NightlySave yes
 wait