Commit libdbi changes

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

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index a009c932d7b3fb486dbb4d8a9f558fbff1d26775..fd71ef336daed3acf591e86d3b7612470fd48767 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
@@ -57,7 +57,11 @@ stop_bacula
 echo "volume=TestVolume001" >tmp/bscan.bsr
 echo "volume=TestVolume002" >>tmp/bscan.bsr
 
-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
+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                   
+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
+fi
 
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
@@ -67,7 +71,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