Rework verify-voltocat-test and add to normal tests

diff --git a/regress/DartTestfile.txt.in b/regress/DartTestfile.txt.in
index 7389690ffcfbd61829245b8d9dcefcdd661fa8b0..b90b37351e385798a7715f973706cd19ec2fbfb9 100644 (file)
--- a/regress/DartTestfile.txt.in
+++ b/regress/DartTestfile.txt.in
@@ -70,6 +70,7 @@ ADD_TEST(disk:two-vol-test "@regressdir@/tests/two-vol-test")
 ADD_TEST(disk:two-volume-test "@regressdir@/tests/two-volume-test")
 ADD_TEST(disk:verify-cat-test "@regressdir@/tests/verify-cat-test")
 ADD_TEST(disk:verify-vol-test "@regressdir@/tests/verify-vol-test")
+ADD_TEST(disk:verify-voltocat-test "@regressdir@/tests/verify-voltocat-test")
 ADD_TEST(disk:virtual-changer-test "@regressdir@/tests/virtual-changer-test")
 ADD_TEST(disk:virtual-backup-test "@regressdir@/tests/virtual-backup-test")
 ADD_TEST(disk:virtual-backup2-test "@regressdir@/tests/virtual-backup2-test")

diff --git a/regress/all-disk-tests b/regress/all-disk-tests
index 76229f4b149b874550b3746c28055d4048db1730..49317a5927d8cc0bad41d000ca6a1941c3fd0ab9 100755 (executable)
--- a/regress/all-disk-tests
+++ b/regress/all-disk-tests
@@ -59,6 +59,7 @@ nice tests/two-jobs-test
 nice tests/two-vol-test
 nice tests/verify-cat-test
 nice tests/verify-vol-test
+nice tests/verify-voltocat-test
 nice tests/weird-files2-test
 nice tests/weird-files-test
 nice tests/migration-job-test

diff --git a/regress/tests/verify-voltocat-test b/regress/tests/verify-voltocat-test
index 1cf26d7baa076d54b933bc31409208b6e65672eb..14447950d10c2f77cc1cd7ed223ebd62b659b6d9 100755 (executable)
--- a/regress/tests/verify-voltocat-test
+++ b/regress/tests/verify-voltocat-test
@@ -2,16 +2,6 @@
 #
 # Run a simple backup of the Bacula build directory
 #   then verify the Volume to the catalog.           
-# This test should not be in the normal tests run since it
-#   requires creating a mount point.
-#
-# To run this test
-#    cd regress
-#    mkdir xx
-#    mkdir xx/boot
-#    mount -t ext3 /dev/sda1 xx/boot
-#      (where /dev/sda1 is your boot partion, or some other small partition)
-#    cp regress/* xx
 #
 TestName="verify-voltocat-test"
 JobName=VerifyVol
@@ -20,8 +10,7 @@ JobName=VerifyVol
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/xx" >${cwd}/tmp/file-list
-echo "${cwd}/xx/boot" >>${cwd}/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
 start_test
@@ -44,6 +33,16 @@ run job=VerifyVolume level=VolumeToCatalog
 yes
 wait
 messages
+@$out ${cwd}/tmp/log3.out
+@#
+@# Now a backup with nothing changed
+run job=$JobName level=Incremental yes
+wait
+messages
+run job=VerifyVolume level=VolumeToCatalog
+yes
+wait
+messages
 @$out
 quit
 END_OF_DATA
@@ -58,5 +57,6 @@ grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^  Termination: *Verify OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-dstat=0
+grep "^  Termination: *Verify OK" tmp/log3.out 2>&1 >/dev/null
+dstat=$?
 end_test