From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 5 Jun 2007 09:54:38 +0000 (+0000)
Subject: Remove GNU specific diff and grep options
X-Git-Tag: Release-7.0.0~6164
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3edb1236174688f00f17d90059d900b6d8376951;p=bacula%2Fbacula

Remove GNU specific diff and grep options

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

diff --git a/regress/tests/maxtime-test b/regress/tests/maxtime-test
index 3168537445..ea69fb26fd 100755
--- a/regress/tests/maxtime-test
+++ b/regress/tests/maxtime-test
@@ -52,7 +52,7 @@ export dstat=0
 export bstat=0
 export rstat=0
 
-if grep -q -e 'RUN_MAXWAITTIME.* Fatal error: Max wait time exceeded. Job canceled.' tmp/RUN_MAXTIME.log
+if grep -e 'RUN_MAXWAITTIME.* Fatal error: Max wait time exceeded. Job canceled.' tmp/RUN_MAXTIME.log >/dev/null 2>&1
 then
     [ "$debug" = 1 ] && echo MAXWAITTIME ok
 else
@@ -60,8 +60,8 @@ else
    rstat=1
 fi
 
-if grep -q -e 'RUN_MAXSTARTDELAY.* Fatal error: Job canceled because max start delay time exceeded.' tmp/RUN_MAXTIME.log &&
-  ! grep -q -e 'NEVER start this' tmp/RUN_MAXTIME.log
+if grep -e 'RUN_MAXSTARTDELAY.* Fatal error: Job canceled because max start delay time exceeded.' tmp/RUN_MAXTIME.log &&
+  ! grep -e 'NEVER start this' tmp/RUN_MAXTIME.log >/dev/null 2>&1
 then
     [ "$debug" = 1 ] && echo MAXSTARTDELAY ok
 else
@@ -69,7 +69,7 @@ else
    rstat=1
 fi
 
-if grep -q -e 'RUN_MAXRUNTIME.* Fatal error: Max run time exceeded. Job canceled.' tmp/RUN_MAXTIME.log
+if grep -e 'RUN_MAXRUNTIME.* Fatal error: Max run time exceeded. Job canceled.' tmp/RUN_MAXTIME.log >/dev/null 2>&1
 then
     [ "$debug" = 1 ] && echo MAXRUNTIME ok
 else
diff --git a/regress/tests/regexwhere-test b/regress/tests/regexwhere-test
index 80f15b94f0..cecbc5f95f 100755
--- a/regress/tests/regexwhere-test
+++ b/regress/tests/regexwhere-test
@@ -283,7 +283,7 @@ find ${cwd}/build > tmp/list
 sed -e 's/[Rr][Ee][Aa][Dd][Mm][Ee]/readme/' -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
+if diff tmp/list.bsed tmp/list.sed >/dev/null 2>&1
 then
     [ "$debug" = 1 ] && echo bregtest ok
 else