From 6457f34ef3b8cb052fc34bcd2d2a7cf69feee3ab Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 29 Aug 2009 15:06:09 +0200
Subject: [PATCH] Rework verify-voltocat-test and add to normal tests

---
 regress/DartTestfile.txt.in        |  1 +
 regress/all-disk-tests             |  1 +
 regress/tests/verify-voltocat-test | 26 +++++++++++++-------------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/regress/DartTestfile.txt.in b/regress/DartTestfile.txt.in
index 7389690ffc..b90b37351e 100644
--- 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 76229f4b14..49317a5927 100755
--- 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 1cf26d7baa..14447950d1 100755
--- 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
-- 
2.39.5