X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbscan-test;h=b39a242f4edb4c0f97a3124da24d77cd1b9fb537;hb=c0aaad2cbccdf8a49448666d2ba89ca4fe531ec9;hp=65b85031ef642999642368f8e88e9a72b48b58e6;hpb=7f350ed9bd70b3cbfdb0d48d091710eb1a6101ac;p=bacula%2Fbacula

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 65b85031ef..b39a242f4e 100755
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -9,14 +9,12 @@
 TestName="bscan-test"
 JobName=bscan
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
-change_jobname $JobName
+scripts/copy-test-confs
+echo "${cwd}/build" >tmp/file-list
 
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
@@ -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_passwd}" = "x"; then
+  PASSWD=
+else
+  PASSWD="-P ${db_passwd}"
+fi
 
 if test "$debug" -eq 1 ; then
-  bin/bscan -w working -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 -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 2>&1 >tmp/log3.out
 fi
 
 cat <<END_OF_DATA >tmp/bconcmds
@@ -66,7 +80,7 @@ messages
 @# now do a restore
 @#
 @#setdebug level=400 storage=File1
-restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores select all storage=File1 done
+restore bootstrap=tmp/kern.bsr where=tmp/bacula-restores select all storage=File1 done
 yes
 wait
 messages