X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=regress%2Ftests%2Faccurate-test;h=cf43ffa13054727c0ebbc83a74327a77ecb754b9;hb=f333a1cec2b992f0cd947d643ebb9c341c805d60;hp=0d84e9ad45e0b9e15ff3fa08ed69b0c8c23480a5;hpb=ab3387e89ae543e6b1af1a1d1f164a6f4ea5dc88;p=bacula%2Fbacula

diff --git a/regress/tests/accurate-test b/regress/tests/accurate-test
index 0d84e9ad45..cf43ffa130 100755
--- a/regress/tests/accurate-test
+++ b/regress/tests/accurate-test
@@ -14,7 +14,8 @@ scripts/cleanup
 
 copy_test_confs
 /bin/cp -f scripts/bacula-dir.conf.accurate bin/bacula-dir.conf
-sed -i s/all,/all,saved,/ bin/bacula-fd.conf
+sed s/all,/all,saved,/ bin/bacula-fd.conf > tmp/1
+cp tmp/1 bin/bacula-fd.conf
 
 change_jobname Client1 $JobName
 
@@ -25,6 +26,8 @@ rm -rf ${cwd}/build/accurate
 
 # add extra files
 mkdir ${cwd}/build/accurate
+mkdir ${cwd}/build/accurate/dirtest
+echo "test test" > ${cwd}/build/accurate/dirtest/hello
 echo "test test" > ${cwd}/build/accurate/xxx
 echo "test test" > ${cwd}/build/accurate/yyy
 echo "test test" > ${cwd}/build/accurate/zzz
@@ -80,6 +83,7 @@ rm -rf ${cwd}/tmp/bacula-restores
 # Now do a second backup after making few changes
 ################################################################
 rm ${cwd}/build/accurate/xxx  # delete a file
+rm ${cwd}/build/accurate/dirtest/hello
 
 run_bconsole
 check_for_zombie_jobs storage=File
@@ -93,6 +97,7 @@ rm -rf ${cwd}/tmp/bacula-restores
 # Now do a third backup after making few changes
 ################################################################
 rm ${cwd}/build/accurate/yyyyyy  # delete a file
+rmdir ${cwd}/build/accurate/dirtest
 
 run_bconsole
 check_for_zombie_jobs storage=File
@@ -266,7 +271,9 @@ cd ..
 
 echo "volume=TestVolume001" >tmp/bscan.bsr
 
-${cwd}/bin/bscan -c ${cwd}/bin/bacula-sd.conf -n regress -u regress -m -s -b tmp/bscan.bsr FileStorage 2>&1 > ${cwd}/tmp/bscan.log
+bscan_libdbi
+
+${cwd}/bin/bscan -c ${cwd}/bin/bacula-sd.conf $BSCANLIBDBI -n regress -u regress -m -s -b tmp/bscan.bsr FileStorage 2>&1 > ${cwd}/tmp/bscan.log
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out ${cwd}/tmp/log1.out
@@ -361,7 +368,7 @@ rm -rf ${cwd}/tmp/bacula-restores
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out ${cwd}/tmp/log1.out
-setdebug  level=1 client
+setdebug  level=1 client=$CLIENT
 run job=backup fileset=FS_TESTJOB2 yes
 wait
 messages
@@ -390,7 +397,7 @@ run_bconsole
 
 grep yyy ${cwd}/tmp/log3.out > /dev/null
 if [ $? != 0 ] ; then
-    print_debug "Can't find xxx file into 'list files' output (${cwd}/tmp/log3.out)"
+    print_debug "Can't find yyy file into 'list files' output (${cwd}/tmp/log3.out)"
     dstat=2
 fi
 
@@ -402,4 +409,3 @@ fi
 
 stop_bacula
 end_test
-