X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Frestore-by-file-tape;h=060a43e73aed41c3857efd94bd451e52cefc8d5c;hb=38b243eb09f97315282dd31dd4f162fcbb6c6778;hp=ef84d5654009bcbf2678c5ed4b8fa74760d6b214;hpb=413c4bb779894fd017bfe789edc5e780f843b8aa;p=bacula%2Fbacula

diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index ef84d56540..060a43e73a 100755
--- a/regress/tests/restore-by-file-tape
+++ b/regress/tests/restore-by-file-tape
@@ -9,9 +9,13 @@
 TestName="restore-by-file-tape"
 JobName=restorebyfile
 . scripts/functions
-copy_tape_confs
 
-echo "${cwd}/build" >/tmp/file-list
+require_tape_drive
+
+scripts/copy-tape-confs
+scripts/cleanup-tape
+
+echo "${cwd}/build" >${cwd}/tmp/file-list
 sed s%\^%${cwd}% ${cwd}/scripts/flist | sort | uniq >${cwd}/tmp/restore2-list
 
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
@@ -20,10 +24,10 @@ sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula
 change_jobname NightlySave $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out   tmp/log1.out
+@$out   ${cwd}/tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=$JobName level=Full yes
 wait
@@ -31,7 +35,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out   tmp/log2.out
+@$out   ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores storage=DDS-4 file=<${cwd}/tmp/restore2-list
 yes
 wait
@@ -56,17 +60,17 @@ for i in `cat ${cwd}/tmp/restore2-list`; do
    fi
 done
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out   tmp/log1.out
+@$out   ${cwd}/tmp/log1.out
 run job=$JobName  level=Full yes
 wait
 messages
 @#
 @# now do a restore
 @#
-@$out   tmp/log2.out
+@$out   ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores
 7
 <${cwd}/tmp/restore2-list
@@ -89,7 +93,7 @@ stop_bacula
 check_two_logs
 
 scripts/check_for_zombie_jobs storage=DDS-4
-bin/bacula stop 2>&1 >/dev/null
+stop_bacula
 for i in `cat ${cwd}/tmp/restore2-list`; do
    diff $i ${cwd}/tmp/bacula-restores$i
    if [ $? != 0 ] ; then