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

Update


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

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 0c05d19202..fc5b15b8b2 100644
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -40,6 +40,35 @@ Job {
 # Prefer Mounted Volumes = no
 }
 
+Job {
+  Name = "NightlySave1"
+  Type = Backup
+  Client=@hostname@-fd 
+  FileSet="Full Set"
+  Storage = DDS-4
+  Messages = Standard
+  Pool = Default
+  Write Bootstrap = "@working_dir@/NightlySave.bsr"
+  Maximum Concurrent Jobs = 4
+  SpoolData = yes
+# Prefer Mounted Volumes = no
+  Client Run Before Job = "/bin/sleep 120"
+}
+
+Job {
+  Name = "NightlySave2"
+  Type = Backup
+  Client=@hostname@-fd 
+  FileSet="Full Set"
+  Storage = DDS-4
+  Messages = Standard
+  Pool = Default
+  Write Bootstrap = "@working_dir@/NightlySave.bsr"
+  Maximum Concurrent Jobs = 4
+  SpoolData = yes
+# Prefer Mounted Volumes = no
+}
+
 
 # Standard Restore template, to be changed by Console program
 Job {
diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index 3315e38e29..477d2fc269 100755
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -56,10 +56,7 @@ sed "s%^MTX.*$%MTX=${4}%g" /tmp/bac$$ >${cwd}/bin/mtx-changer
 chmod 777 ${cwd}/bin/mtx-changer
 
 # get proper SD tape definitions
-touch ${cwd}/bin/tape_options
-if test x`uname` = xLinux ; then
-   cp -f ${cwd}/scripts/linux_tape_options ${cwd}/bin/tape_options
-fi
+cp -f ${cwd}/scripts/linux_tape_options ${cwd}/bin/tape_options
 if test x`uname` = xFreeBSD ; then
    cp -f ${cwd}/scripts/freebsd_tape_options ${cwd}/bin/tape_options
 fi
diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index b51f48f533..44950aa28e 100755
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -4,7 +4,7 @@
 #   split the archive into two volumes, then build a BSR with
 #   the restore command and use bextract to restore the files.
 #
-debug=0
+debug=1
 if test "$debug" -eq 1 ; then
   out="tee"
 else
@@ -23,7 +23,7 @@ echo " === Starting bextract-test at `date +%R:%S` ===" >working/log
 echo " "
 
 cat <<END_OF_DATA >tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @$out tmp/log1.out
 label storage=File1 volume=TestVolume001
diff --git a/regress/tests/two-pool-tape b/regress/tests/two-pool-tape
index e84cbecd57..38c59e6ea5 100755
--- a/regress/tests/two-pool-tape
+++ b/regress/tests/two-pool-tape
@@ -82,11 +82,13 @@ messages
 @$out tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0
-run job=NightlySave level=Full pool=Default yes
+list volumes
+@# Start job with Client run before and sleep
+run job=NightlySave1 level=Full pool=Default yes
 @# wait between starting jobs
 @sleep 60
 @#setdebug level=100 storage=DDS-4
-run job=NightlySave level=Full pool=Full yes
+run job=NightlySave2 level=Full pool=Full yes
 @sleep 10
 messages
 @sleep 10
@@ -95,6 +97,7 @@ messages
 status storage=DDS-4
 messages
 wait
+list volumes
 messages
 @# 
 @# now do a restore