X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Frestore2-by-file-test;h=1a4553ab14693a0ecfe2edefd1afee0e35260934;hb=7db9b96e131be6ca1537a142d6af9fcd20a87848;hp=b374c4020d3fda9589646eb68dbe57a30834173a;hpb=7536ad5ca65a3bde880d0890b942be653a6ad631;p=bacula%2Fbacula

diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index b374c4020d..1a4553ab14 100755
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -6,21 +6,18 @@
 TestName="restore2-by-file-test"
 JobName=restore2byfile
 . scripts/functions
-set_debug 0
+copy_test_confs
 
-cwd=`pwd`
-scripts/copy-test-confs
-scripts/cleanup
-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
 
 change_jobname CompressedTest $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=File volume=TestVolume001
 run job=$JobName yes
 wait
@@ -28,7 +25,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore2-list
 yes
 wait