X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fverify-vol-test;h=d6bd8e8348fa04080557f511dd6ff4123fea6ad7;hb=a45166182785c04da7be201b370a7f199edcf8b3;hp=5cd729795618095f1e1c466ae24b4f6f4535a0f5;hpb=c37d94ac16c7b3c019e2b665c45c9141943987e0;p=bacula%2Fbacula

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 5cd7297956..d6bd8e8348 100755
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -5,8 +5,8 @@
 #
 cwd=`pwd`
 scripts/copy-test-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
-rm -f tmp/original
+scripts/cleanup
+echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
 bin/make_sqlite_tables
@@ -14,13 +14,14 @@ bin/make_sqlite_tables
 echo " "
 echo " "
 echo " === Starting verify Volume Test ==="
+echo " === Starting verify Volume Test ===" >>working/log
 echo " "
 
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
-@output
+@output tmp/log1.out
 label storage=File
 TestVolume001
 run job=NightlySave
@@ -30,18 +31,20 @@ messages
 @# 
 @# now do a verify volume
 @#
+@output ${cwd}/tmp/original
 run job=VerifyVolume
 yes
 wait
-@tee ${cwd}/tmp/original
 messages
 @output
 quit
 END_OF_DATA
 sleep 2
-bin/bacula stop
-grep "Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null
-if [ $? != 0 ] ; then
+bin/bacula stop 2>&1 >/dev/null
+grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+bstat=$?
+grep "^Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null
+if [ $? != 0 -o $bstat != 0 ] ; then
    echo " "
    echo " "
    echo "  ===== Verify Volume failed!!! ===== "
@@ -50,6 +53,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== Verify Volume Test OK ===== "
    echo "  ===== Verify Volume Test OK ===== " >>test.out
-   rm -rf /tmp/bacula-restores /tmp/TestVolume001
-   rm -f ${cwd}/tmp/original
+   scripts/cleanup
 fi