Clean up scripts

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

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 036a669f38b82a7a25ab9001b7ee9bff18a858b8..5d39ab13e2e1c2477b160ebd3907fd3b4a4ee570 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -6,6 +6,7 @@
 cwd=`pwd`
 scripts/copy-test-confs
 rm -rf /tmp/TestVolume001 /tmp/bacula-restores
+rm -f tmp/original
 bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
 bin/make_sqlite_tables
@@ -32,14 +33,14 @@ messages
 run job=VerifyVolume
 yes
 wait
-@tee /tmp/original
+@tee ${cwd}/tmp/original
 messages
 @output
 quit
 END_OF_DATA
 sleep 2
 bin/bacula stop
-grep "Termination: *Verify OK" /tmp/original 2>&1 >/dev/null
+grep "Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null
 if [ $? != 0 ] ; then
    echo " "
    echo " "
@@ -49,6 +50,6 @@ 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
 fi
-rm -rf /tmp/bacula-restores
-rm -f /tmp/original