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

Update


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

diff --git a/regress/Makefile.in b/regress/Makefile.in
index d5d82a5053..fb73118a86 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -18,13 +18,13 @@ first_rule: all
 
 all:
 
-setup: bacula
+setup: bacula sed
 
 # 
 # Some machines cannot handle the sticky bit and other garbage that
 #  is in weird-files, so we load and run it only on Linux machines.
 #
-bacula: all sed
+bacula: all
 	@rm -rf bin build weird-files tmp
 	(if test x`uname` = xLinux -o x`uname` = xFreeBSD ; then \
 	   tar xfz weird-files.tar.gz ;\
diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 203cec84c6..fc5b15b8b2 100644
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -36,7 +36,6 @@ 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 8f69bb30af..e330719aa0 100755
--- a/regress/tests/2drive-incremental-2tape
+++ b/regress/tests/2drive-incremental-2tape
@@ -35,6 +35,8 @@ cd ${cwd}
 outf="tmp/sed_tmp"
 echo "s%# Prefer Mounted Volumes%  Prefer Mounted Volumes%g" >${outf}
 cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
+# Comment the next line out to write everything to one drive
+#  otherwise, it writes the two jobs to different drives
 sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 
 echo " "
@@ -50,10 +52,11 @@ 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
+@#setdebug level=100 storage=DDS-4
 run job=NightlySave yes
 run job=NightlySave yes
 wait
+list volumes
 status storage=DDS-4
 messages
 quit
@@ -79,6 +82,7 @@ status storage=DDS-4
 @#setdebug level=400 storage=DDS-4
 run level=Incremental job=NightlySave yes
 wait
+list volumes
 status storage=DDS-4
 messages
 @#