Enhance verify test to do DiskToCatalog

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7576 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index db4514cbf5b4622c2022dc1c31ac2b56176f4322..9977d8ebf82434d8347d9bb0f86e73f391841fce 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -19,7 +19,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-setdebug level=100 storage=File sd
+setdebug level=1 storage=File sd
 label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
@@ -27,12 +27,17 @@ messages
 @# 
 @# now do a verify volume
 @#
-@$out ${cwd}/tmp/original
+@$out ${cwd}/tmp/log2.out
 setdebug level=12 dir
 run job=VerifyVolume
 yes
 wait
 messages
+@$out ${cwd}/tmp/log3.out
+run job=VerifyVolume level=DiskToCatalog
+yes
+wait
+messages
 @$out
 quit
 END_OF_DATA
@@ -45,7 +50,11 @@ stop_bacula
 
 grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^  Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null
+grep "^  Termination: *Verify OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
+if test $rstat=0; then
+   grep "^  Termination: *Verify OK" tmp/log3.out 2>&1 >/dev/null
+   rstat=$?
+fi
 dstat=0
 end_test