From: Elena Gryaznova <elena.gryaznova@oracle.com>
Date: Mon, 14 Feb 2011 16:53:09 +0000 (+0300)
Subject: b=23670 exit_status () fix
X-Git-Tag: 1.8.5.55~17
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=c7b1d8419233d701c25a43e5beda5b690c03755c;p=fs%2Flustre-release.git

b=23670 exit_status () fix

i=Vladimir.Saveliev
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 29080ba..932b07e 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2596,7 +2596,7 @@ exit_status () {
     local status=0
     local log=$TESTSUITELOG
 
-    [ -f "$log" ] && grep -q FAIL $log && status=1
+    [ -f "$log" ] && egrep -q .FAIL $log && status=1
     exit $status
 }
 
@@ -2752,7 +2752,7 @@ trace() {
 
 complete () {
     equals_msg $1 test complete, duration $2 sec
-    [ -f "$TESTSUITELOG" ] && egrep .FAIL $TESTSUITELOG || true
+    [ -f "$TESTSUITELOG" ] && grep ".IGNORE\|.FAIL" $TESTSUITELOG || true
     echo duration $2 >>$TESTSUITELOG
 }