Temp remove next-vol-test

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

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index c6892ae560cf190e883ed72e9711b3d8427af0c6..b39a242f4edb4c0f97a3124da24d77cd1b9fb537 100755 (executable)
--- 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
@@ -22,9 +22,9 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out tmp/log1.out
 label storage=File1
-TestVolume002
-label storage=File1
 TestVolume001
+label storage=File1
+TestVolume002
 update Volume=TestVolume001 MaxVolBytes=3000000
 run job=$JobName storage=File1
 yes
@@ -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=${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