Make test work as expected

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

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index fd71ef336daed3acf591e86d3b7612470fd48767..89f5fc1471ec2e760b1766a095c2bbdfc8354d88 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -57,10 +57,19 @@ stop_bacula
 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 -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 >tmp/log3.out
+  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
@@ -71,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