X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbscan-test;h=20ac940a3eba22d353c93ce80f1e9b366fad5344;hb=38b243eb09f97315282dd31dd4f162fcbb6c6778;hp=92e81651d6e4958037029364aad80e39bbca68c1;hpb=7c52ff6fb2806d25c3f7e0c1d37f4503e3dbdee0;p=bacula%2Fbacula

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 92e81651d6..20ac940a3e 100755
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -9,12 +9,10 @@
 TestName="bscan-test"
 JobName=bscan
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >tmp/file-list
 
 change_jobname NightlySave $JobName
 start_test
@@ -31,6 +29,12 @@ update Volume=TestVolume001 MaxVolBytes=3000000
 run job=$JobName storage=File1
 yes
 wait
+list volumes
+list files jobid=1
+sql
+select * from JobMedia;
+
+
 messages
 @$out /dev/null
 @#
@@ -50,12 +54,22 @@ run_bacula
 check_for_zombie_jobs storage=File1
 stop_bacula
 
-echo "volume=TestVolume001|TestVolume002" >tmp/bscan.bsr
+echo "volume=TestVolume001" >tmp/bscan.bsr
+echo "volume=TestVolume002" >>tmp/bscan.bsr
+
+bscan_libdbi
+
+# If the database has a password pass it to bscan
+if test "x${db_password}" = "x"; then
+  PASSWD=
+else
+  PASSWD="-P ${db_password}"
+fi
 
 if test "$debug" -eq 1 ; then
-  bin/bscan -w working -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp
+  $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 -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >/dev/null
+  $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 >tmp/log3.out 2>&1
 fi
 
 cat <<END_OF_DATA >tmp/bconcmds