X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbackup-to-null;h=a8b2af2f390d027efb8c694fd5121f14801924e9;hb=ef33273cecc466a71ce597c06024d8fac53fbe1d;hp=3f3df219cc3a672c62c1e638173d24a667634404;hpb=1e27bdd783f5453d04cdd42f1b8153eb25798113;p=bacula%2Fbacula

diff --git a/regress/tests/backup-to-null b/regress/tests/backup-to-null
index 3f3df219cc..a8b2af2f39 100755
--- a/regress/tests/backup-to-null
+++ b/regress/tests/backup-to-null
@@ -9,24 +9,22 @@
 TestName="backup-to-null"
 JobName=backuptonull
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-fifo-confs
 
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
-rm -f tmp/log1.out tmp/log2.out
+rm -f ${cwd}/tmp/log1.out ${cwd}/tmp/log2.out
 start_test
 
 
 # Write out bconsole commands
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 @#setdebug level=200 storage=Dummy
 label storage=Dummy volume=TestVolume001 slot=0 pool=Default
 run job=$JobName yes
@@ -48,10 +46,10 @@ stop_bacula
 touch ${cwd}/build/src/dird/*.c
 echo "test test" > ${cwd}/build/src/dird/xxx
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 list volumes
 run job=$JobName yes
 wait
@@ -65,9 +63,9 @@ run_bacula
 check_for_zombie_jobs storage=Dummy
 stop_bacula
 
-grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+grep "^  Termination: *Backup OK" ${cwd}/tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^  Termination: *Backup OK" tmp/log2.out 2>&1 >/dev/null
+grep "^  Termination: *Backup OK" ${cwd}/tmp/log2.out 2>&1 >/dev/null
 dstat=$?
 
 # not yet implemented