avoid gnu grep features

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32204 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-02-18 16:10:47 +00:00
parent 75e1c29fda
commit 85c411150c
3 changed files with 16 additions and 8 deletions

View file

@ -1,3 +1,9 @@
2011-01-18 Richard Frith-Macdonald <rfm@gnu.org>
* TestFramework/gnustep-tests:
* TestFramework/Summary.sh:
Tweak use of grep for portability
2011-01-16 Richard Frith-Macdonald <rfm@gnu.org>
* TestFramework/example1.m:

View file

@ -18,12 +18,12 @@ then
exit 0
fi
grep -q "\(Failed set\|Failed sets\|Failed test\|Failed tests\|Failed build\|Failed build\|Failed file\|Failed files\)$" tests.sum
grep "\(Failed set\|Failed sets\|Failed test\|Failed tests\|Failed build\|Failed build\|Failed file\|Failed files\)$" tests.sum >/dev/null
if [ $? = 1 ]
then
echo "All OK!"
grep -q "\(Dashed hope\|Dashed hopes\)$" tests.sum
grep "\(Dashed hope\|Dashed hopes\)$" tests.sum >/dev/null
if [ $? = 0 ]
then
echo
@ -32,7 +32,7 @@ then
echo "would like to help, please contact the package maintainer."
fi
grep -q "\(Skipped set\|Skipped sets\)$" tests.sum
grep "\(Skipped set\|Skipped sets\)$" tests.sum >/dev/null
if [ $? = 0 ]
then
echo
@ -52,7 +52,7 @@ else
exit 0
fi
grep -q "\(Failed build\|Failed build\)$" tests.sum
grep "\(Failed build\|Failed build\)$" tests.sum >/dev/null
if [ $? = 0 ]
then
echo
@ -61,7 +61,7 @@ else
echo "to try to figure out why and fix it or ask for help."
fi
grep -q "\(Failed file\|Failed files\)$" tests.sum
grep "\(Failed file\|Failed files\)$" tests.sum >/dev/null
if [ $? = 0 ]
then
echo
@ -72,7 +72,7 @@ else
echo "a patch (or at least a bug report) to the package maintainer."
fi
grep -q "\(Failed set\|Failed sets\)$" tests.sum
grep "\(Failed set\|Failed sets\)$" tests.sum >/dev/null
if [ $? = 0 ]
then
echo
@ -83,7 +83,7 @@ else
echo "the package maintainer."
fi
grep -q "\(Failed test\|Failed tests\)$" tests.sum
grep "\(Failed test\|Failed tests\)$" tests.sum >/dev/null
if [ $? = 0 ]
then
echo

View file

@ -187,7 +187,9 @@ run_test_file ()
cat $CWD/tests.sum.tmp >> $CWD/tests.sum
# If there were failures or unresolved tests then report them...
if grep -L "^\(Failed build\|Failed file\|Failed set\|Failed test\):" $CWD/tests.sum.tmp > /dev/null; then
grep "^\(Failed build\|Failed file\|Failed set\|Failed test\):" $CWD/tests.sum.tmp 2>/dev/null >/dev/null
if [ $? = "0" ]
then
echo
echo $TESTFILE:
grep "^\(Failed build\|Failed file\|Failed set\|Failed test\):" $CWD/tests.sum.tmp