]> git.sur5r.net Git - bacula/bacula/blobdiff - regress/tests/bscan-test
regress: add function to create many dirs
[bacula/bacula] / regress / tests / bscan-test
index 89f5fc1471ec2e760b1766a095c2bbdfc8354d88..49e3acf36d33b8674ef86df9cf49a3f42bf9f2f1 100755 (executable)
@@ -60,16 +60,16 @@ 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
+if test "x${db_password}" = "x"; then
   PASSWD=
 else
-  PASSWD="-P ${db_passwd}"
+  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                   
+  $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 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 >tmp/log3.out 2>&1
 fi
 
 cat <<END_OF_DATA >tmp/bconcmds
@@ -84,7 +84,6 @@ restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores select al
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA