X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbscan-test;h=89f5fc1471ec2e760b1766a095c2bbdfc8354d88;hb=e5ef682130f94d5afa513a28cea931bf55220884;hp=a009c932d7b3fb486dbb4d8a9f558fbff1d26775;hpb=1959560b32a4f8f1c079fb2cd9a38a0086cd24c8;p=bacula%2Fbacula

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index a009c932d7..89f5fc1471 100755
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -12,7 +12,7 @@ JobName=bscan
 
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >tmp/file-list
 
 change_jobname NightlySave $JobName
 start_test
@@ -57,7 +57,20 @@ stop_bacula
 echo "volume=TestVolume001" >tmp/bscan.bsr
 echo "volume=TestVolume002" >>tmp/bscan.bsr
 
-bin/bscan -w working -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >tmp/log3.out
+bscan_libdbi
+
+# If the database has a password pass it to bscan
+if test "x${db_passwd}" = "x"; then
+  PASSWD=
+else
+  PASSWD="-P ${db_passwd}"
+fi
+
+if test "$debug" -eq 1 ; then
+  bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp                   
+else
+  bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >tmp/log3.out
+fi
 
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null