regress: fix multi2-storage-test

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

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 2cbe9087c385426ca879376a5daafc9caaff5fa1..c85c403999b6744033beca46eb6f90a2b016acf8 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -9,15 +9,15 @@ JobName=compressed
 
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname CompressedTest $JobName
 start_test
       
-cat <<END_OF_DATA >tmp/bconcmds
-@output
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 status all
 status all
 messages
@@ -28,7 +28,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -36,7 +36,6 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 
@@ -46,7 +45,7 @@ stop_bacula
 
 check_two_logs
 check_restore_diff
-grep " Software Compression" tmp/log1.out | grep "%" 2>&1 1>/dev/null
+grep " Software Compression" ${cwd}/tmp/log1.out | grep "%" 2>&1 1>/dev/null
 if [ $? != 0 ] ; then
    echo "  !!!!! No compression !!!!!"
    bstat=1