X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fansi-label-tape;h=d8d3b48f0579bb7151cec2c2f35135792a7e823b;hb=ccb41474b231924fa189d67b4aac90f5f2a2899d;hp=28cd2325f1e312be550eaaa6828a375e77919ce9;hpb=da2a8453dfbdecc2516758c87e53c3d98784be44;p=bacula%2Fbacula

diff --git a/regress/tests/ansi-label-tape b/regress/tests/ansi-label-tape
index 28cd2325f1..d8d3b48f05 100755
--- a/regress/tests/ansi-label-tape
+++ b/regress/tests/ansi-label-tape
@@ -12,21 +12,23 @@ TestName="ansi-label-tape"
 JobName=backuptape
 . scripts/functions
 
+require_tape_drive
+
 scripts/copy-tape-confs
 /bin/cp -f scripts/ansi-sd-tape.conf bin/bacula-sd.conf
 scripts/cleanup-tape
 
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
 start_test
 
 # 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
+@$out ${cwd}/tmp/log1.out
+setdebug level=200 storage=DDS-4
 label storage=DDS-4 volume=Vol001 slot=0 pool=Default
 purge volume=Vol001
 relabel pool=Default storage=DDS-4 oldVolume=Vol001 volume=Vol002 slot=0
@@ -40,7 +42,8 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
+setdebug level=200 storage=DDS-4
 restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait
@@ -58,12 +61,12 @@ stop_bacula
 touch ${cwd}/build/src/dird/*.c
 echo "test test" > ${cwd}/build/src/dird/xxx
 
-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
 list volumes
-setdebug level=300 storage=DDS-4
+@#setdebug level=300 storage=DDS-4
 run job=$JobName yes
 wait
 list volumes
@@ -71,7 +74,7 @@ messages
 @# 
 @# now do a second restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 list volumes
 restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes