X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ffifo-test;h=c0dcd4232fada43e36827570ce5e7733289954c3;hb=52484c379b6b1690c140dccfd2dcdc1833e0190f;hp=48d0b8787e83a634064e5260ea0d06cb8a086cd5;hpb=5c137c47a5577af445f67a49e3e2b3e087fdc07b;p=bacula%2Fbacula

diff --git a/regress/tests/fifo-test b/regress/tests/fifo-test
index 48d0b8787e..c0dcd4232f 100755
--- a/regress/tests/fifo-test
+++ b/regress/tests/fifo-test
@@ -5,24 +5,23 @@
 TestName="fifo-test"
 JobName=FIFOTest
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
-#scripts/copy-test-confs
-echo "/tmp/bfifo" >/tmp/file-list
+scripts/copy-test-confs
+echo "${cwd}/tmp/bfifo" >${cwd}/tmp/file-list
 
-rm -f /tmp/bfifo
+rm -f ${cwd}/tmp/bfifo
+mkfifo ${cwd}/tmp/bfifo
 # send a file into the fifo
 file=encrypt-bug.jpg
-cat ${file} >/tmp/bfifo&
+cat ${file} >${cwd}/tmp/bfifo&
 
 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
 run job=$JobName storage=File1 yes
 wait
@@ -33,14 +32,15 @@ END_OF_DATA
 
 run_bacula
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File1 done
+@$out ${cwd}/tmp/log2.out
+@#setdebug level=50 client=$CLIENT
+restore where=/  select all storage=File1 done
 yes
 wait
 messages
@@ -48,7 +48,7 @@ messages
 quit
 END_OF_DATA
 
-cat </tmp/bfifo >tmp/${file} &
+cat <${cwd}/tmp/bfifo >${cwd}/tmp/${file}&
 
 run_bconsole
 
@@ -56,6 +56,6 @@ check_for_zombie_jobs storage=File1
 stop_bacula
 
 check_two_logs
-diff ${file} tmp/${file}
+diff ${file} ${cwd}/tmp/${file}
 dstat=$?
 end_test