Update

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5638 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape
index 41ae4b9ac149ee5158fb64ad62c6f32f26ca8f14..644db627a26d56cff4cd1ffabe0b087a75e7bc30 100755 (executable)
--- a/regress/tests/bscan-tape
+++ b/regress/tests/bscan-tape
@@ -114,7 +114,11 @@ cd bin
 cd ..
 
 echo "volume=TestVolume001" >tmp/bscan.bsr
-bin/bscan -w working -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 2>&1 >/dev/null
+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 DDS-4                
+else
+  bin/bscan -w working -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 2>&1 >/dev/null
+fi
 
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null

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