From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 14 Nov 2005 21:06:38 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-1.38.1~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2b40b068ce0de0f975b918028a91bbafea670732;p=bacula%2Fbacula

Update


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

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 9b21deae3c..37de8ad3c1 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
+  Prefer Mounted Volumes = no
 # Autochanger = yes
 }
 
diff --git a/regress/scripts/copy-win32-confs b/regress/scripts/copy-win32-confs
index e301ef9ee4..61483fa15f 100755
--- a/regress/scripts/copy-win32-confs
+++ b/regress/scripts/copy-win32-confs
@@ -1,6 +1,6 @@
 #!/bin/sh
 /bin/cp -f scripts/win32-bacula-dir-tape.conf bin/bacula-dir.conf
 /bin/cp -f scripts/win32-bacula-sd-tape.conf bin/bacula-sd.conf
-/bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
+/bin/cp -f scripts/win32-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
 touch bin/tape_options
diff --git a/regress/scripts/win32-bacula-dir-tape.conf.in b/regress/scripts/win32-bacula-dir-tape.conf.in
index 4f84e18190..5c2af4f967 100644
--- a/regress/scripts/win32-bacula-dir-tape.conf.in
+++ b/regress/scripts/win32-bacula-dir-tape.conf.in
@@ -89,6 +89,19 @@ Client {
   Maximum Concurrent Jobs = 4
 }
 
+Client {
+  Name = localhost-fd
+  Address = localhost
+  FDPort = 8102
+  Catalog = MyCatalog
+  Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"
+  File Retention = 30d                # 30 days
+  Job Retention = 180d                # six months
+  AutoPrune = yes                     # Prune expired Jobs/Files
+  Maximum Concurrent Jobs = 4
+}
+
+
 # Definition of DDS tape storage device
 Storage {
   Name = DDS-4
diff --git a/regress/tests/2drive-incremental-2tape b/regress/tests/2drive-incremental-2tape
index 7f8d90c2b7..c460d17851 100755
--- a/regress/tests/2drive-incremental-2tape
+++ b/regress/tests/2drive-incremental-2tape
@@ -45,6 +45,7 @@ messages
 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1
 run job=NightlySave yes
+run job=NightlySave yes
 wait
 status storage=DDS-4
 messages
diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index aa8e56f2fe..2e020e766b 100755
--- a/regress/tests/auto-label-test
+++ b/regress/tests/auto-label-test
@@ -2,6 +2,13 @@
 #
 #  Test if Bacula can automatically create a Volume label.
 #
+
+debug=0
+if test "$debug" -eq 1 ; then
+  out="tee"
+else
+  out="output"
+fi
 cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
@@ -16,14 +23,13 @@ echo " === Starting auto-label-test at `date +%R:%S` ==="
 echo " === Starting auto-label-test at `date +%R:%S` ===" >>working/log
 echo " "
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
-@output /dev/null
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
 status all
 status all
 list pools
 messages
-@output tmp/log1.out
+@$out tmp/log1.out
 run job=CompressedTest storage=File yes
 list pools
 list volumes
@@ -32,7 +38,7 @@ messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@$out tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -49,9 +55,18 @@ done
 yes
 wait
 messages
-@output
+@$out
 quit
 END_OF_DATA
+
+if test "$debug" -eq 1 ; then
+  bin/bacula start
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+else
+  bin/bacula start 2>&1 >/dev/null
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
+fi
+
 scripts/check_for_zombie_jobs storage=File
 
 bin/bacula stop 2>&1 >/dev/null