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

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