From: Elena Gryaznova <grev@sun.com>
Date: Wed, 26 May 2010 11:03:21 +0000 (+0400)
Subject: b=22215 mpi_run (): p4_error fix
X-Git-Tag: v1_10_0_43~11
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=8d239ab2b8059460a1925351011afbbe712ae989

b=22215 mpi_run (): p4_error fix

i=Brian.Murrell

fail if mpirun output contains p4_error, independently from error message and value
---

diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh
index 859802b..4d9ea51 100644
--- a/lustre/tests/functions.sh
+++ b/lustre/tests/functions.sh
@@ -185,7 +185,7 @@ mpi_run () {
     eval $command 2>&1 | tee $mpilog || true
 
     rc=${PIPESTATUS[0]}
-    if [ $rc -eq 0 ] && grep -q "p4_error: : [^0]" $mpilog ; then
+    if [ $rc -eq 0 ] && grep -q "p4_error:" $mpilog ; then
        rc=1
     fi
     return $rc