X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fscratch-pool-test;h=11016ff4edc50f9dcb71354f5e55861a30751768;hb=55b2a841b303bc2ac121e14ce0e6659cb1d46cb0;hp=29c319ee703dcb0fac0d66c6f37b9bc995f61a17;hpb=45dc0d2f1f568fcc62526533adacde65df441837;p=bacula%2Fbacula

diff --git a/regress/tests/scratch-pool-test b/regress/tests/scratch-pool-test
index 29c319ee70..11016ff4ed 100755
--- a/regress/tests/scratch-pool-test
+++ b/regress/tests/scratch-pool-test
@@ -15,7 +15,6 @@ TestName="scratch-pool-test"
 JobName=scratch-pool
 . scripts/functions
 
-. config.out
 if test x${AUTOCHANGER} = x/dev/null ; then
    echo "two-volume-test skipped. No autochanger."
    exit
@@ -23,11 +22,11 @@ fi
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
  
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-outf="tmp/sed_tmp"
+outf="${cwd}/tmp/sed_tmp"
 echo "s%# Maximum File Size%  Maximum File Size%g" >${outf}
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
@@ -36,10 +35,10 @@ change_jobname NightlySave $JobName
 start_test
 
 # Write out bconsole commands
-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=DDS-4 volume=TestVolume001 slot=1 pool=Scratch drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 pool=Scratch drive=0
 update Volume=TestVolume001 MaxVolBytes=2000000 pool=Scratch drive=0
@@ -55,7 +54,7 @@ llist volume=TestVolume001
 @# 
 @# 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