Update

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

diff --git a/regress/scripts/bacula-dir-migration.conf.in b/regress/scripts/bacula-dir-migration.conf.in
index cd5309e0784926a413361b641ef97b22d82108fe..fb577c7666d9ae778af5538edae833721c048131 100644 (file)
--- a/regress/scripts/bacula-dir-migration.conf.in
+++ b/regress/scripts/bacula-dir-migration.conf.in
@@ -181,8 +181,8 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
   MailOnError = @job_email@ = all, !terminate
   operator = @job_email@ = mount
   console = all, !skipped, !terminate, !restored

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index dc2475327eba4c3ebeacab0b0d361e10669ce9a1..ca90370c553a4149e26bba75246d8e407a123467 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -139,8 +139,8 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
   MailOnError = @job_email@ = all, !terminate
   operator = @job_email@ = mount
   console = all, !skipped, !terminate, !restored
@@ -195,4 +195,3 @@ Pool {
   AutoPrune = yes                     # Prune expired volumes
   Volume Retention = 365d             # one year
 }
-

diff --git a/regress/scripts/bacula-dir-win32-tape.conf.in b/regress/scripts/bacula-dir-win32-tape.conf.in
index 2ea42a8392097487bdc245dd6ee485bc340c59e2..bf29899b56a7b64c4fa33b3a7da868f1027c1d86 100644 (file)
--- a/regress/scripts/bacula-dir-win32-tape.conf.in
+++ b/regress/scripts/bacula-dir-win32-tape.conf.in
@@ -110,8 +110,8 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
   MailOnError = @job_email@ = all, !terminate
   operator = @job_email@ = mount
   console = all, !skipped, !terminate, !restored

diff --git a/regress/scripts/prepare-two-disks b/regress/scripts/prepare-two-disks
index 1a8c6db46d81711faf95f2dd039862cc38241aeb..959daa4201564d2d620ccb8192c60aa422d95c92 100755 (executable)
--- a/regress/scripts/prepare-two-disks
+++ b/regress/scripts/prepare-two-disks
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Cread fresh virtual disk changer directory
+# Create fresh virtual disk changer directory
 #
 rm -rf tmp/disk-changer
 mkdir tmp/disk-changer

diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk
index 68eb9f452dfaae94d87f1c4f65f4f137366c8c3f..a2227f79bb38c8a2405b73236da3d9a034edc816 100755 (executable)
--- a/regress/tests/incremental-2disk
+++ b/regress/tests/incremental-2disk
@@ -5,7 +5,7 @@
 #
 # This script uses the virtual disk autochanger
 #
-TestName="incremental-2disk-test"
+TestName="incremental-2disk"
 JobName=Inc2disk
 . scripts/functions
 set_debug 0

diff --git a/regress/weird-files.tar.gz b/regress/weird-files.tar.gz
index f84d1c0a6de310a1caa2fa48237b2eeda3be9bb0..94a12dd3179fefc4e53a62ac4e4070fd285b8cae 100644 (file)
Binary files a/regress/weird-files.tar.gz and b/regress/weird-files.tar.gz differ