X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fincremental-2media;h=902f1df5a0c92ffd3765ffa515179debd2b0213b;hb=7e44ec3c3206e286f4a549ab17904a10774f8716;hp=c476b16819f03d4ba56dbe18099b1444bdf66dd7;hpb=21670c06664088d7fa45b24306b0b1232682eb1d;p=bacula%2Fbacula

diff --git a/regress/tests/incremental-2media b/regress/tests/incremental-2media
index c476b16819..902f1df5a0 100755
--- a/regress/tests/incremental-2media
+++ b/regress/tests/incremental-2media
@@ -10,21 +10,20 @@ TestName="incremental-2media"
 JobName=Inc2media
 . scripts/functions
 
-. config.out
 
 scripts/cleanup
 scripts/copy-2disk-confs
 scripts/prepare-two-disks
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname $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=Default drive=0
 label storage=File volume=TestVolume002 Pool=Default
 run job=$JobName yes
@@ -40,10 +39,10 @@ echo "Backup 1 done"
 touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 
-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
 @# Force Incremental on the second Volume
 update volume=TestVolume001 VolStatus=Used
 setdebug level=51 storage=File
@@ -53,7 +52,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 setdebug level=51 storage=DDS-4
 restore where=${cwd}/tmp/bacula-restores select all done 
 yes