X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fincremental-2media-tape;h=054ac7f771abf0ebcacd7cd7839028b0c4b780c3;hb=55b2a841b303bc2ac121e14ce0e6659cb1d46cb0;hp=3bfe5c52516c7b89f44ddfbacd5da7002e97e90b;hpb=9e253b9f0e9696d27ede64d72b32b48562f4f9a8;p=bacula%2Fbacula

diff --git a/regress/tests/incremental-2media-tape b/regress/tests/incremental-2media-tape
index 3bfe5c5251..054ac7f771 100755
--- a/regress/tests/incremental-2media-tape
+++ b/regress/tests/incremental-2media-tape
@@ -10,6 +10,8 @@ TestName="incremental-2media-tape"
 JobName=Inc2mediaTape
 . scripts/functions
 
+require_tape_drive
+require_second_drive
 
 scripts/cleanup
 # Get conf files
@@ -29,17 +31,17 @@ mt -f /dev/nst0 weof
 mt -f /dev/nst1 rewind
 mt -f /dev/nst1 weof
 
-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
-label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
+@$out ${cwd}/tmp/log1.out
+label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 Pool=Default drive=$DRIVE1
 label storage=DLT80 volume=TestVolume002 Pool=Default
 run job=$JobName yes
 wait
@@ -54,10 +56,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=DLT80
@@ -68,7 +70,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