X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Frestore-by-file-tape;h=fefc274ac860a9a6e17a3ef44769e0e2652ae018;hb=8ce5fd38f0cff237755db8b1761ef8e827aaf00c;hp=2813fe2367c293d0896bb227779377f7b002a105;hpb=5b4f40e5baaa8cbba795741f60488e464fddea1e;p=bacula%2Fbacula

diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index 2813fe2367..fefc274ac8 100755
--- a/regress/tests/restore-by-file-tape
+++ b/regress/tests/restore-by-file-tape
@@ -9,23 +9,25 @@
 TestName="restore-by-file-tape"
 JobName=restorebyfile
 . scripts/functions
-set_debug 0
+
+require_tape_drive
 
 scripts/copy-tape-confs
 scripts/cleanup-tape
-echo "${cwd}/build" >/tmp/file-list
-sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list
+
+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
 sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
-change_jobname $JobName
+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
@@ -33,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
@@ -46,8 +48,6 @@ run_bacula
 check_for_zombie_jobs storage=DDS-4
 stop_bacula
 
-check_two_logs
-
 dstat=0
 #
 # We need to stop and start Bacula to
@@ -60,19 +60,17 @@ for i in `cat ${cwd}/tmp/restore2-list`; do
    fi
 done
 
-end_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
 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
@@ -102,4 +100,5 @@ for i in `cat ${cwd}/tmp/restore2-list`; do
       dstat=1
    fi
 done
+
 end_test