X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Frestore-seek-tape;h=041c278debe474065e11b3635e8d4727f3500a03;hb=e5ef682130f94d5afa513a28cea931bf55220884;hp=72c81b8f8f4f25c42d311677852b11611cd70b73;hpb=45dc0d2f1f568fcc62526533adacde65df441837;p=bacula%2Fbacula

diff --git a/regress/tests/restore-seek-tape b/regress/tests/restore-seek-tape
index 72c81b8f8f..041c278deb 100755
--- a/regress/tests/restore-seek-tape
+++ b/regress/tests/restore-seek-tape
@@ -10,8 +10,12 @@ TestName="restore-seek-tape"
 JobName=restore-tape-seek
 . scripts/functions
 
-copy_tape_confs
-echo "${cwd}/tmp/build" >/tmp/file-list
+require_tape_drive
+
+scripts/copy-tape-confs
+scripts/cleanup-tape
+
+echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 rm -rf ${cwd}/tmp/build
 mkdir ${cwd}/tmp/build
 # Copy only the .c files (to be restored)
@@ -24,7 +28,7 @@ done
 cd ${cwd}/tmp/build
 ls >../1
 cd ..
-sed s%\^%${cwd}/tmp/build/% 1 >restore-list
+sed s%\^%${cwd}/tmp/build/% 1 | sort | uniq >restore-list
 #
 # At this point restore-list contains the list
 #  of files we will restore
@@ -47,10 +51,10 @@ sed "s%# Maximum File Size = 1000000%  Maximum File Size = 10KB%" ${cwd}/tmp/1 >
 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
 label storage=DDS-4 volume=TestVolume001 pool=Default
 run job=$JobName yes
 wait
@@ -58,7 +62,7 @@ messages
 @#
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 setdebug level=30 fd
 setdebug level=10 storage=DDS-4
 sql