Updates

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

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 721e46e0def04f701d97910193dbccd9354ef0ac..e46599fe770d06d78c88b1f25d6564c581de981a 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -107,6 +107,10 @@ check_two_logs()
 {
    grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
    bstat=$?
+   grep "^  Termination: *Backup Error" tmp/log1.out 2>&1 >/dev/null
+   if test $? -eq 0; then
+      bstat=2
+   fi
    grep "^  Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
    rstat=$?
    grep "^  Termination: *Restore OK -- warning file count mismatch" tmp/log2.out 2>&1 >/dev/null

diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in
index 2d5163512b311e02b6616fd13ba39b18c73b44a0..c4fcdda7aed5665edebc80a9fe1a2789ec9c35c5 100644 (file)
--- a/regress/scripts/new-test-bacula-dir.conf.in
+++ b/regress/scripts/new-test-bacula-dir.conf.in
@@ -364,4 +364,5 @@ Pool {
   AutoPrune = yes                     # Prune expired volumes
   Volume Retention = 365d             # one year
 # Label Format = "TEST-${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}:${NumVols}"
+# Maximum Volume Jobs = 1
 }