Update

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

diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index a9dd36cb72b22aab7aae417791144b9307ad123c..ab66b3e7fccea58c71fa445e4810dbb63c38fdbc 100755 (executable)
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -31,6 +31,7 @@ tests/verify-vol-test
 tests/weird-files2-test
 tests/weird-files-test
 tests/migration-job-test
+tests/migration-jobspan-test
 tests/migration-volume-test
 tests/migration-time-test
 tests/hardlink-test

diff --git a/regress/scripts/.cvsignore b/regress/scripts/.cvsignore
index 640b3a16415048b4ac4394641a73d8b37a335f83..9b411b0739d40e9df89efbc617a654678fe28610 100644 (file)
--- a/regress/scripts/.cvsignore
+++ b/regress/scripts/.cvsignore
@@ -1,3 +1,5 @@
+bacula-dir-migration.conf
+bacula-sd-migration.conf
 crypto-bacula-fd.conf
 new-test-bacula-dir.conf
 bacula-dir.conf

diff --git a/regress/scripts/bacula-sd-migration.conf.in b/regress/scripts/bacula-sd-migration.conf.in
new file mode 100644 (file)
index 0000000..db45c6b
--- /dev/null
+++ b/regress/scripts/bacula-sd-migration.conf.in
@@ -0,0 +1,72 @@
+#
+# Default Bacula Storage Daemon Configuration file
+#
+#  For Bacula release 1.39
+#
+# You may need to change the name of your tape drive
+#   on the "Archive Device" directive in the Device
+#   resource.  If you change the Name and/or the 
+#   "Media Type" in the Device resource, please ensure
+#   that dird.conf has corresponding changes.
+#
+
+Storage {                             # definition of myself
+  Name = @hostname@-sd
+  SDPort = 8103                  # Director's port      
+  WorkingDirectory = "@working_dir@"
+  Pid Directory = "@piddir@"
+  Subsys Directory = "@subsysdir@"
+}
+
+#
+# List Directors who are permitted to contact Storage daemon
+#
+Director {
+  Name = @hostname@-dir
+  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
+}
+
+#
+# Devices supported by this Storage daemon
+# To connect, the Director's bacula-dir.conf must have the
+#  same Name and MediaType. 
+#
+Autochanger {
+  Name = DiskChanger
+  Changer Device = @disk_drive@/conf
+  Changer Command ="@scriptdir@/disk-changer %c %o %S %a %d"
+  Device = Drive-0
+}
+
+Device {
+  Name = Drive-0                   # 
+  Device Type = File
+  Media Type = DiskChanger
+  Archive Device = @disk_drive@/drive0
+  AutomaticMount = yes;               # when device opened, read it
+  Autochanger = yes
+  Drive Index = 0
+  AlwaysOpen = yes;
+  RemovableMedia = yes;
+# Maximum File Size = 1000000
+}
+
+Device {
+  Name = FileStorage
+  Media Type = File
+  Archive Device = @tmpdir@
+  LabelMedia = yes;                   # lets Bacula label unlabeled media
+  Random Access = Yes;
+  AutomaticMount = yes;               # when device opened, read it
+  RemovableMedia = no;
+  AlwaysOpen = no;
+}
+
+# 
+# Send all messages to the Director, 
+# mount messages also are sent to the email address
+#
+Messages {
+  Name = Standard
+  director = @hostname@-dir = all, !terminate
+}

diff --git a/regress/scripts/functions b/regress/scripts/functions
index ff4501d35062b06a3fe6dc70a9cb6b3321b77bb2..7da6d3805812f0c25b3106b396813a8bc415dc76 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -81,8 +81,8 @@ change_jobname()
    fi
    rm -f bin/1
    mv bin/bacula-dir.conf bin/1
-   echo "s%${oldname}%${newname}%g" >/tmp/1
-   sed -f /tmp/1 bin/1 >bin/bacula-dir.conf
+   echo "s%${oldname}%${newname}%g" >tmp/1
+   sed -f tmp/1 bin/1 >bin/bacula-dir.conf
 #  echo "Job ${oldname} changed to ${newname}"
 }
 

diff --git a/regress/tests/2drive-incremental-2tape b/regress/tests/2drive-incremental-2tape
index b12de8337263c6722f7184d9a1d2f5bb9c8e3e26..a301c1ca5530e7ed354cd19e78567ca7c6f4832c 100755 (executable)
--- a/regress/tests/2drive-incremental-2tape
+++ b/regress/tests/2drive-incremental-2tape
@@ -13,7 +13,7 @@ fi
 TestName="2drive-incremental-2tape"
 JobName="2drive2tape"
 . scripts/functions
-set_debug 1
+set_debug 0
 
 cwd=`pwd`
 

diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape
index 2273044fe5f971ae78d6a7375da8b695c0cccbc3..acfda15f3ed4cd7128f924aad866f7694f0775d0 100755 (executable)
--- a/regress/tests/truncate-bug-tape
+++ b/regress/tests/truncate-bug-tape
@@ -6,7 +6,7 @@ TestName="truncate-bug-tape"
 JobName=truncatebug
 . scripts/functions
 
-set_debug 1
+set_debug 0
 copy_tape_confs
 
 echo "${cwd}/build" >/tmp/file-list

diff --git a/regress/tests/verify-vol-tape b/regress/tests/verify-vol-tape
index f1ec9c27be2ad122b667c45fd3284a1e31ca0a55..c544bc6603d2270a23369186263d8ebc1a6e88c5 100755 (executable)
--- a/regress/tests/verify-vol-tape
+++ b/regress/tests/verify-vol-tape
@@ -6,7 +6,7 @@
 TestName="verify-vol-tape"
 JobName=VerifyVol
 . scripts/functions
-set_debug 1
+set_debug 0
 
 copy_tape_confs