Check for file count mismatch

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

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 910b57fe047fcc0b0d96c6285575fb6204978f14..28c85f3a77cc3cc612b7cffe38b1463095f1af81 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -109,6 +109,10 @@ check_two_logs()
    bstat=$?
    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
+   if test $? -eq 0; then
+      rstat = 2
+   fi
 }
 
 check_restore_diff()

diff --git a/regress/tests/ansi-label-tape b/regress/tests/ansi-label-tape
index 28cd2325f1e312be550eaaa6828a375e77919ce9..e64ff19a048ea3564fcb80c378518f9f63a05c61 100755 (executable)
--- a/regress/tests/ansi-label-tape
+++ b/regress/tests/ansi-label-tape
@@ -63,7 +63,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out tmp/log1.out
 list volumes
-setdebug level=300 storage=DDS-4
+@#setdebug level=300 storage=DDS-4
 run job=$JobName yes
 wait
 list volumes