regress: tweak timing in prune-copy-test

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

diff --git a/regress/tests/errors-test b/regress/tests/errors-test
index ca7e2bcd79c2f6d4587fe9bc70c064b3c2cdeb93..0b9865e4dd1b797f99060423bce8ba296de2e00e 100755 (executable)
--- a/regress/tests/errors-test
+++ b/regress/tests/errors-test
@@ -11,16 +11,16 @@ JobName=backup
 scripts/cleanup
 copy_test_confs
 
-rm -f tmp/*.log
+rm -f ${cwd}/tmp/*.log
 /bin/cp -f scripts/bacula-dir.conf.errors bin/bacula-dir.conf
-echo "${cwd}/build/po" >/tmp/file-list
+echo "${cwd}/build/po" >${cwd}/tmp/file-list
 
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@output tmp/LOCAL_INC_ERR.log
+@$out ${cwd}/tmp/LOCAL_INC_ERR.log
 label storage=File volume=TestVolume001
 add storage=File2
 1
@@ -29,31 +29,31 @@ File2
 run job=LOCAL_INC_ERR yes
 wait
 messages
-@output tmp/REMOTE_INC_ERR.log
+@$out ${cwd}/tmp/REMOTE_INC_ERR.log
 run job=REMOTE_INC_ERR yes
 wait
 messages
-@output tmp/LOCAL_EXCL_ERR.log
+@$out ${cwd}/tmp/LOCAL_EXCL_ERR.log
 run job=LOCAL_EXCL_ERR yes
 wait
 messages
-@$out tmp/REMOTE_EXCL_ERR.log
+@$out ${cwd}/tmp/REMOTE_EXCL_ERR.log
 run job=REMOTE_EXCL_ERR yes
 wait
 messages
-@$out tmp/REMOTE_RUNSCRIPT_ERR.log
+@$out ${cwd}/tmp/REMOTE_RUNSCRIPT_ERR.log
 run job=REMOTE_RUNSCRIPT_ERR yes
 wait
 messages
-@$out tmp/LOCAL_RUNSCRIPT_ERR.log
+@$out ${cwd}/tmp/LOCAL_RUNSCRIPT_ERR.log
 run job=LOCAL_RUNSCRIPT_ERR yes
 wait
 messages
-@$out tmp/CLIENT_CONNECT_TIMEOUT.log
+@$out ${cwd}/tmp/CLIENT_CONNECT_TIMEOUT.log
 run job=CLIENT_CONNECT_TIMEOUT yes
 wait
 messages
-@$out tmp/SD_CONNECT_TIMEOUT.log
+@$out ${cwd}/tmp/SD_CONNECT_TIMEOUT.log
 run job=SD_CONNECT_TIMEOUT yes
 wait
 messages
@@ -63,8 +63,8 @@ quit
 END_OF_DATA
 
 run_bacula
-touch tmp/log1.out
-client=$(grep client= bin/bacula-dir.conf)
+touch ${cwd}/tmp/log1.out
+client=`grep client= $bin/bacula-dir.conf`
 check_for_zombie_jobs storage=File $client
 stop_bacula