X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=regress%2Ftests%2Fwin32-to-linux-tape;h=743945f4a7a896f6b68b443a27a634b38e052f8e;hb=9069d2fe01f419778c977cd4db47bb9e6b52cd02;hp=5640e9f9eccaa5f5c4405ca1a835b0fb3f71d3a5;hpb=5b3eb90d679c9c5006f9ed3b2ebe9dab0baa4f64;p=bacula%2Fbacula

diff --git a/regress/tests/win32-to-linux-tape b/regress/tests/win32-to-linux-tape
index 5640e9f9ec..743945f4a7 100755
--- a/regress/tests/win32-to-linux-tape
+++ b/regress/tests/win32-to-linux-tape
@@ -7,24 +7,25 @@
 TestName="win32-to-linux-tape"
 JobName=AutoLabel
 . scripts/functions
-set_debug 0
+
+require_tape_drive
 
 scripts/copy-win32-confs
 scripts/cleanup-tape
 
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_job $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0
+label storage=tape volume=TestVolume001 slot=0 pool=Default drive=0
 run job=NightlySave yes
 @sleep 10
-status storage=DDS-4
+status storage=tape
 @sleep 30
 messages
 wait
@@ -33,14 +34,14 @@ messages
 @# now do a restore
 @#
 @$out tmp/log2.out
-restore where=/tmp/bacula-restores client=Tibs select all storage=DDS-4 done
+restore where=${cwd}/tmp/bacula-restores client=Tibs select all storage=tape done
 yes
 wait
 messages
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs