X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Frestore-disk-seek-test;h=38fc0f7b7ba781e30fbb43bcb2b19df6d93c1256;hb=9585308707921844c2ec545701dc6be3d4e2ae0b;hp=d0b64600523f6f28bf3c279f299b8e86e8186f00;hpb=00b2e2f4e4580254fdcd9a4f746faedd2c955386;p=bacula%2Fbacula

diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test
index d0b6460052..38fc0f7b7b 100755
--- a/regress/tests/restore-disk-seek-test
+++ b/regress/tests/restore-disk-seek-test
@@ -9,38 +9,49 @@
 TestName="restore-disk-seek-test"
 JobName=restore-disk-seek
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/tmp/build" >/tmp/file-list
+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)
-cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build
+#  set files to "*.c" for all c files
+files="ua_tree.c ua_update.c"
+#  files="*.c"
+for i in ${files}; do
+   cp -p ${cwd}/build/src/dird/${i} ${cwd}/tmp/build
+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
+#
 rm -f 1
 cd ${cwd}
-# Now backup *everything* 
+#
+# Now arrange to backup *everything* 
+#
 rm -rf  ${cwd}/tmp/build
 mkdir ${cwd}/tmp/build
 cp -fp ${cwd}/build/src/dird/* ${cwd}/tmp/build
-# Enable MaximumFileSize
+#
+# Enable MaximumFileSize to ensure lots of JobMedia records and thus
+#  lots of seeking
+#
 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 CompressedTest $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=File volume=TestVolume001
 run job=$JobName yes
 wait
@@ -48,8 +59,11 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
+setdebug level=30 fd     
+setdebug level=11 storage=File
 sql
+@# print the JobMedia records
 select * from JobMedia;
 
 restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores storage=File
@@ -70,7 +84,9 @@ stop_bacula
 # Now setup a control directory of only what we *should* restore
 rm -rf ${cwd}/tmp/build
 mkdir  ${cwd}/tmp/build
-cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build
+for i in ${files}; do
+   cp -p ${cwd}/build/src/dird/${i} ${cwd}/tmp/build
+done
 
 check_two_logs
 check_restore_tmp_build_diff