[mpich2-commits] r8055 - mpich2/trunk/test/mpi

[balaji at mcs.anl.gov]

Author: balaji
Date: 2011-02-25 20:46:46 -0600 (Fri, 25 Feb 2011)
New Revision: 8055

Modified:
   mpich2/trunk/test/mpi/runtests.in
Log:
Update the MPICH2 test suite to handle Hydra's new error outputs.

Modified: mpich2/trunk/test/mpi/runtests.in
===================================================================
--- mpich2/trunk/test/mpi/runtests.in	2011-02-26 02:46:42 UTC (rev 8054)
+++ mpich2/trunk/test/mpi/runtests.in	2011-02-26 02:46:46 UTC (rev 8055)
@@ -632,7 +632,7 @@
 	$inline .= $_;
 	# ANY output is an error. We have the following output
 	# exception for the Hydra process manager.
-	if (/\[mpiexec at .*\] ONE OF THE PROCESSES TERMINATED BADLY: CLEANING UP/) { next; }
+	if (/=*/) { last; }
 	if (! /^\s*$/) {
 	    print STDERR "Unexpected output in $programname: $_";
 	    if (!$found_error) {
@@ -677,7 +677,7 @@
 	if (/signaled with Interrupt/) { next; }
 	# Allow 'job ending due to env var MPIEXEC_TIMEOUT' (mpd)
 	if (/job ending due to env var MPIEXEC_TIMEOUT/) { next; }
-	# Allow 'EXIT STRING: Terminated \(signal 15\)' (hydra)
+	# Allow 'APPLICATION TIMED OUT' (hydra)
 	if (/\[mpiexec at .*\] APPLICATION TIMED OUT/) { last; }
 	# ANY output is an error (other than timeout) 
 	if (! /^\s*$/) {