updates

[bacula/bacula] / regress / tests / bscan-test

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 9a158974f974896dcf8438ad96f5f5077f66e4fb..20ac940a3eba22d353c93ce80f1e9b366fad5344 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -59,13 +59,18 @@ echo "volume=TestVolume002" >>tmp/bscan.bsr
 
 bscan_libdbi
 
-if test "$debug" -eq 1 ; then
-  bin/bscan -w working $BSCANLIBDBI -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp                   
+# If the database has a password pass it to bscan
+if test "x${db_password}" = "x"; then
+  PASSWD=
 else
-  bin/bscan -w working $BSCANLIBDBI -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >tmp/log3.out
+  PASSWD="-P ${db_password}"
 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 >tmp/log3.out 2>&1
+fi
 
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
@@ -75,7 +80,7 @@ messages
 @# now do a restore
 @#
 @#setdebug level=400 storage=File1
-restore bootstrap=tmp/kern.bsr where=tmp/bacula-restores select all storage=File1 done
+restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores select all storage=File1 done
 yes
 wait
 messages