fix fifo tests

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4612 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/tests/backup-bacula-fifo b/regress/tests/backup-bacula-fifo
index bb09ea33474301b0193a0e102d518260fa233f89..b650807eef8442f06fd04356aaccd2b92c08261a 100755 (executable)
--- a/regress/tests/backup-bacula-fifo
+++ b/regress/tests/backup-bacula-fifo
@@ -9,8 +9,10 @@
 TestName="backup-bacula-fifo"
 JobName=backupfifo
 . scripts/functions
-set_debug 0
+set_debug 1
 
+cwd=`pwd`
+scripts/cleanup
 scripts/copy-fifo-confs
 
 echo "${cwd}/build" >/tmp/file-list

diff --git a/regress/tests/fifo-test b/regress/tests/fifo-test
index 8ff28b8c6740783231e3741f2dae0435154354ca..05980a8cd2a1c0eac6d8f12192b045d04d0f6243 100755 (executable)
--- a/regress/tests/fifo-test
+++ b/regress/tests/fifo-test
@@ -13,6 +13,7 @@ scripts/copy-test-confs
 echo "/tmp/bfifo" >/tmp/file-list
 
 rm -f /tmp/bfifo
+mkfifo /tmp/bfifo
 # send a file into the fifo
 file=encrypt-bug.jpg
 cat ${file} >/tmp/bfifo&
@@ -40,7 +41,8 @@ messages
 @# now do a restore
 @#
 @$out tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File1 done
+@#setdebug level=50 client
+restore where=/  select all storage=File1 done
 yes
 wait
 messages
@@ -48,7 +50,7 @@ messages
 quit
 END_OF_DATA
 
-cat </tmp/bfifo >tmp/${file} &
+cat </tmp/bfifo >tmp/${file}&
 
 run_bconsole