X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Frestore-by-file-test;h=ec5a70fc22e54e68f1ee789bc429b09b8e0ca381;hb=7ec6a7e8c7b6908e321883b18dbc64e244bc282a;hp=8801eb9a63be19bcea22f6b1009a965adcf24043;hpb=0830bb18ada29945abbd1aebaad51c424d7d4593;p=bacula%2Fbacula

diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 8801eb9a63..ec5a70fc22 100755
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -5,37 +5,36 @@
 #
 
 TestName="restore-by-file-test"
-JobName=SpanVol
+JobName=restorebyfile
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/tmp/build" >/tmp/file-list
+scripts/copy-test-confs
+echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 mkdir ${cwd}/tmp/build
 cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build
 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
 rm -f 1
 cd ${cwd}
 
+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=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores storage=File
 7
 <${cwd}/tmp/restore-list