X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbsr-opt-test;h=9413a8c081fcbd344020433bb8ac0e33c8e0098e;hb=86e786f4fb2faf7c9487a0bf4633371cbb57b759;hp=fa61dde540c5b310f790621360a1a41ae19c1ceb;hpb=0830bb18ada29945abbd1aebaad51c424d7d4593;p=bacula%2Fbacula

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index fa61dde540..9413a8c081 100755
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -9,20 +9,18 @@
 TestName="bsr-opt-test"
 JobName=bsr-opt
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
-change_jobname $JobName
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
+change_jobname NightlySave $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File1 volume=TestVolume001
 label storage=File1 volume=TestVolume002
 update Volume=TestVolume001 MaxVolBytes=3000000
@@ -32,7 +30,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore bootstrap=${cwd}/working/restore.bsr where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 cd ${cwd}/build/src/cats
@@ -58,7 +56,7 @@ grep TestVolume002 working/restore.bsr 2>&1 >/dev/null
 bsrstat=$?
 check_two_logs
 
-diff -r build/src/cats  tmp/bacula-restores${cwd}/build/src/cats 2>&1 >/dev/null
+diff -r build/src/cats  ${cwd}/tmp/bacula-restores${cwd}/build/src/cats 2>&1 >/dev/null
 if [ $? != 0 -o $bsrstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "