From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sat, 28 Apr 2007 11:43:10 +0000 (+0000)
Subject: ebl  small fix
X-Git-Tag: Release-7.0.0~6485
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=245caac38b3d693f67b5cc3f0bfdc7f6a357bdc1;p=bacula%2Fbacula

ebl  small fix


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

diff --git a/regress/tests/regexwhere-test b/regress/tests/regexwhere-test
index ba85e19b67..abd62c1ee1 100755
--- a/regress/tests/regexwhere-test
+++ b/regress/tests/regexwhere-test
@@ -250,8 +250,8 @@ else
 fi
 
 J=JobI
-if grep  "Restore OK"  tmp/RUN_$J &&
-   grep  "${cwd}/build/po/fr.po.old" tmp/RUN_$J
+if grep  -q "Restore OK"  tmp/RUN_$J &&
+   grep  -q "${cwd}/build/po/fr.po.old" tmp/RUN_$J
 then
     [ "$debug" = 1 ] && echo $J ok
 else
@@ -261,10 +261,10 @@ fi
 
 
 J=JobJ
-if grep  "Restore OK"      tmp/RUN_$J &&
-   grep  "/etc/passwd.old" tmp/RUN_$J &&
-   grep  "Where:      /tmp/bacula-restore-it" tmp/RUN_$J &&
-   grep  "${cwd}/build/po/fr.po.old" tmp/RUN_$J
+if grep -q "Restore OK"      tmp/RUN_$J &&
+   grep -q "/etc/passwd.old" tmp/RUN_$J &&
+   grep -q -e "Where: */tmp/bacula-restore-it" tmp/RUN_$J &&
+   grep -q "${cwd}/build/po/fr.po.old" tmp/RUN_$J
 then
     [ "$debug" = 1 ] && echo $J ok
 else
@@ -275,8 +275,8 @@ fi
 # test with bregtest
 
 find ${cwd}/build > tmp/list
-sed -e 's/readme/readme/i' -e 's/\([ch]\)$/.old.\1/' tmp/list > /tmp/list.sed
-./build/src/tools/bregtest -s -f tmp/list -e '/readme/readme/i,/([ch])$/.old.$1/' > /tmp/list.bsed
+sed -e 's/readme/readme/i' -e 's/\([ch]\)$/.old.\1/' tmp/list > tmp/list.sed
+./build/src/tools/bregtest -s -f tmp/list -e '/readme/readme/i,/([ch])$/.old.$1/' > tmp/list.bsed
 
 if diff -q tmp/list.bsed tmp/list.sed
 then