X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2F2drive-3pool-test;h=5bc6259f560d15e13eeff1ab99a783aa0f2ebe0e;hb=d0afb9386d99f0e4f14dc065a5eb5109fb2befe4;hp=c463c0cf54bf9cffa2c1c5ce3aef71bdd250df94;hpb=7cc61016fdcca3db60e21bb48735351919d43fc6;p=bacula%2Fbacula

diff --git a/regress/tests/2drive-3pool-test b/regress/tests/2drive-3pool-test
index c463c0cf54..5bc6259f56 100755
--- a/regress/tests/2drive-3pool-test
+++ b/regress/tests/2drive-3pool-test
@@ -14,8 +14,9 @@ JobName="2dr3pooldisk"
 scripts/cleanup
 scripts/copy-2disk-drive-confs
 scripts/prepare-two-disks
+CLIENT=2drive2disk
 
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 change_jobname NightlySave $JobName
 start_test
 
@@ -28,10 +29,10 @@ start_test
 # sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 
 # 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=51 storage=DDS-4
 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Full    drive=1
@@ -57,13 +58,13 @@ END_OF_DATA
 # exit
 
 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
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait