Make machine name independent + move log to working

[bacula/bacula] / regress / tests / sparse-test

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 9d536dc2f74487460901f2feb0b7d127cf5b3d4f..f04f2f60091147356419ab5238f1e14ae60083df 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -5,7 +5,7 @@
 #
 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
@@ -14,6 +14,7 @@ bin/make_sqlite_tables
 echo " "
 echo " "
 echo " === Starting sparse-test ==="
+echo " === Starting sparse-test ===" >>working/log
 echo " "
 
 bin/bacula start
@@ -21,7 +22,7 @@ bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output
-label
+label storage=File
 TestVolume001
 run job=SparseTest
 yes
@@ -40,7 +41,7 @@ messages
 quit
 END_OF_DATA
 bin/bacula stop
-diff -ur build /tmp/bacula-restores${cwd}/build
+diff -r build /tmp/bacula-restores${cwd}/build
 if [ $? != 0 ] ; then
    echo " "
    echo " "
@@ -50,5 +51,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== sparse-test Bacula source OK ===== "
    echo "  ===== sparse-test OK ===== " >>test.out
-   rm -rf /tmp/bacula-restores /tmp/TestVolume001
+   scripts/cleanup
 fi