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

[balaji at mcs.anl.gov]

Author: balaji
Date: 2011-01-26 10:48:17 -0600 (Wed, 26 Jan 2011)
New Revision: 7836

Modified:
   mpich2/trunk/test/mpi/runtests.in
Log:
The MPICH2 test suite seems to expect a fixed output for the tests. In
cases where the application fails (intentionally), the process manager
is open to throw any appropriate error message as it finds useful. We
have been using exceptions for the process managers we know of. This
commit adds a few more exceptions for Hydra. Fixes the nightly test
"failures".

Reviewed by buntinas.

Modified: mpich2/trunk/test/mpi/runtests.in
===================================================================
--- mpich2/trunk/test/mpi/runtests.in	2011-01-26 16:48:16 UTC (rev 7835)
+++ mpich2/trunk/test/mpi/runtests.in	2011-01-26 16:48:17 UTC (rev 7836)
@@ -630,7 +630,9 @@
 	# Skip FORTRAN STOP
 	if (/FORTRAN STOP/) { next; }
 	$inline .= $_;
-	# ANY output is an error.
+	# 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 (! /^\s*$/) {
 	    print STDERR "Unexpected output in $programname: $_";
 	    if (!$found_error) {
@@ -676,7 +678,7 @@
 	# 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)
-	if (/APPLICATION TERMINATED WITH THE EXIT STRING: Hangup \(signal 1\)/) { next; }
+	if (/\[mpiexec at .*\] APPLICATION TIMED OUT/) { last; }
 	# ANY output is an error (other than timeout) 
 	if (! /^\s*$/) {
 	    print STDERR "Unexpected output in $programname: $_";