From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 24 Feb 2008 12:44:39 +0000 (+0000)
Subject: ebl  fix bscan test
X-Git-Tag: Release-3.0.0~1811
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=96b5deb9d8fce068c1a622b45c4d5d4fb2f10918;p=bacula%2Fbacula

ebl  fix bscan test


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

diff --git a/regress/tests/accurate-test b/regress/tests/accurate-test
index d44ef35536..ba9d0ca640 100755
--- a/regress/tests/accurate-test
+++ b/regress/tests/accurate-test
@@ -1,9 +1,7 @@
 #!/bin/sh
 #
 # TODO:
-#  - test bls
 #  - test bextract
-#  - test bscan
 #  - with strip path 
 #
 # Run a accurate backup of the Bacula build directory
@@ -38,7 +36,6 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 label volume=TestVolume001 storage=File pool=Default
-label volume=TestVolume002 storage=File pool=Default
 messages
 END_OF_DATA
 
@@ -90,7 +87,7 @@ rm -rf ${cwd}/tmp/bacula-restores
 # Check with bls
 ################################################################
 
-${cwd}/bin/bls -c ${cwd}/bin/bacula-sd.conf -V 'TestVolume001|TestVolume002' FileStorage > tmp/bls.out
+${cwd}/bin/bls -c ${cwd}/bin/bacula-sd.conf -V 'TestVolume001' FileStorage > tmp/bls.out
 if ! grep -- '----' tmp/bls.out | grep xxx > /dev/null
 then
     bstat=2
@@ -185,9 +182,8 @@ cd ${cwd}/bin
 cd ..
 
 echo "volume=TestVolume001" >tmp/bscan.bsr
-echo "volume=TestVolume002" >>tmp/bscan.bsr
 
-${cwd}/bin/bscan -c ${cwd}/bin/bacula-sd.conf -n regress -u regress -m -s -b tmp/bscan.bsr FileStorage 2>&1 > /dev/null
+${cwd}/bin/bscan -c ${cwd}/bin/bacula-sd.conf -n regress -u regress -m -s -b tmp/bscan.bsr FileStorage 2>&1 > ${cwd}/tmp/bscan.log
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out ${cwd}/tmp/log1.out
@@ -220,6 +216,7 @@ rm -rf ${cwd}/tmp/bacula-restores
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out ${cwd}/tmp/log1.out
+label volume=TestVolume002 storage=File pool=Default
 run job=backup_advance yes
 wait
 messages