X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ffixed-block-size-tape;h=7ba4d453b84e6fcefe1fdccdb727b52ee22d56be;hb=25daee7d2a896f1da1f4ac8ffd8b1b57454d1943;hp=4d07bccdf13f0586d232a834c0907b0dc4986dcb;hpb=5b4f40e5baaa8cbba795741f60488e464fddea1e;p=bacula%2Fbacula

diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape
index 4d07bccdf1..7ba4d453b8 100755
--- a/regress/tests/fixed-block-size-tape
+++ b/regress/tests/fixed-block-size-tape
@@ -7,11 +7,12 @@
 TestName="fixed-block-size-tape"
 JobName=fixedblocksize
 . scripts/functions
-set_debug 0
 
-scripts/copy-tape-confs
-scripts/cleanup-tape
-echo "${cwd}/build" >/tmp/file-list
+require_tape_drive
+
+copy_tape_confs
+
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 echo "s%# Maximum Block Size%  Maximum Block Size%" >${cwd}/tmp/2
@@ -26,22 +27,23 @@ if [ $? != 0 ] ; then
 fi
 rm -f ${cwd}/tmp/1 ${cwd}/tmp/2
 
-change_jobname $JobName
+change_jobname NightlySave $JobName
 start_test
 
 
-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
+setdebug level=51 storage=DDS-4
 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
-run job=NightlySave yes
+run job=$JobName yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
 unmark *
 mark *