b=17973

i=Brian
mpi_run: process mpi output to get an error

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index d875b49..7f8f92b 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2615,6 +2615,8 @@ get_mds_dir () {
 mpi_run () {
     local mpirun="$MPIRUN $MPIRUN_OPTIONS"
     local command="$mpirun $@"
 mpi_run () {
     local mpirun="$MPIRUN $MPIRUN_OPTIONS"
     local command="$mpirun $@"

+    local mpilog=$TMP/mpi.log
+    local rc

 
     if [ "$MPI_USER" != root -a $mpirun ]; then
         echo "+ chmod 0777 $MOUNT"
 
     if [ "$MPI_USER" != root -a $mpirun ]; then
         echo "+ chmod 0777 $MOUNT"


@@ -2624,7 +2626,14 @@ mpi_run () {
 
     ls -ald $MOUNT
     echo "+ $command"
 
     ls -ald $MOUNT
     echo "+ $command"

-    eval $command
+    eval $command 2>&1 > $mpilog || true
+
+    rc=${PIPESTATUS[0]}
+    if [ $rc -eq 0 ] && grep -q "p4_error: : [^0]" $mpilog ; then
+       rc=1
+    fi
+    cat $mpilog
+    return $rc

 }
 
 mdsrate_cleanup () {
 }
 
 mdsrate_cleanup () {