X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fthree-pool-test;h=ba4597f3765693fcccfc8772a97d87d6d74bc36b;hb=2e5e66ecd7f814cdee43f1b93ac4085fcc9ac875;hp=ab34b373fe5f5d9ba457d7d7ec8c993e0c35efd7;hpb=edc0a98d1dc60ec5e2c90c9b845481e8e588bbda;p=bacula%2Fbacula

diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test
index ab34b373fe..ba4597f376 100755
--- a/regress/tests/three-pool-test
+++ b/regress/tests/three-pool-test
@@ -14,13 +14,14 @@ JobName="threepooldisk"
 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
 
 # Turn off Prefer Mounted Volumes so we use 2 drives
-outf="tmp/sed_tmp"
+outf="${cwd}/tmp/sed_tmp"
 echo "s%# Prefer Mounted Volumes%  Prefer Mounted Volumes%g" >${outf}
 cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
 # Comment the next line out to write everything to one drive
@@ -28,12 +29,12 @@ cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
 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
-setdebug level=200 storage=DDS-4
-setdebug level=200 client 
+@$out ${cwd}/tmp/log1.out
+@#setdebug level=200 storage=DDS-4
+@#setdebug level=200 client=$CLIENT 
 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Full    drive=0
 label storage=DDS-4 volume=TestVolume003 slot=3 Pool=Inc     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