From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 24 Sep 2007 16:33:23 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-7.0.0~5620
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5be70263921f391d4c8f1c355c07b5b851a8887a;p=bacula%2Fbacula

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 41ae4b9ac1..644db627a2 100755
--- 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 a009c932d7..c6892ae560 100755
--- 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