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 3168537445c55360a49d3a48cba635a5e423d0cb..ea69fb26fd6d9e8474c4d11ccc9fdba43e20f163 100755 (executable)
--- 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 80f15b94f0aabf31a08f58a8a2355c86c828d205..cecbc5f95f47c6bd998ccd3ab7110648486ffcb5 100755 (executable)
--- 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