Make out of freespace non-fatal for removable devices -- i.e. behaves like tape

[bacula/bacula] / regress / tests / verify-vol-test

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 88e875ac662fffb7d48d61d9b004d3410e22efdd..3509ea6232b40026778b8b83908c32632db837af 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # Run a simple backup of the Bacula build directory
 #   then verify the catalog.           
@@ -11,12 +16,18 @@ cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
 echo "${cwd}/build" >${cwd}/tmp/file-list
+rm -f ${cwd}/build/sparsefile
+#
+# Add this back when verify can handle sparse files
+#  the same way that backup does
+#
+#dd if=${cwd}/build/configure of=${cwd}/build/sparsefile bs=1 count=1 seek=10M
 
 change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @$out tmp/log1.out
 setdebug level=1 storage=File sd
@@ -27,16 +38,28 @@ 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
+@$out ${cwd}/tmp/log3.out
+run job=VerifyVolume level=DiskToCatalog
+yes
+wait
+messages
 quit
 END_OF_DATA
 
+#
+#  ***FIXME***
+# Note, add sparse file backup and check that checksum is
+#  correct.  Bug #1140
+#  create sparse file
+#  dd if=/dev/zero of=sparsefile bs=1 count=0 seek=10M
+#
+
 run_bacula
 
 sleep 2
@@ -45,7 +68,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