From c7cb72a0fa50f15203777e7c1ed4bf70e07d2dd6 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 23 Sep 2007 18:41:22 +0000 Subject: [PATCH] Updates git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5627 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/functions | 4 ++++ regress/scripts/new-test-bacula-dir.conf.in | 1 + 2 files changed, 5 insertions(+) diff --git a/regress/scripts/functions b/regress/scripts/functions index 721e46e0de..e46599fe77 100644 --- 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 2d5163512b..c4fcdda7ae 100644 --- 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 } -- 2.39.5