From 50130868c2f0c10d86bf368ede7154f6845b0d51 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 5 Nov 2013 16:54:24 +0100
Subject: [PATCH] MPI_Abort can theorically fail.  Add a call to exit() to
 ensure that the program really stops.

---
 examples/smpi/NAS/FT/ft.f                           |  5 +++++
 teshsuite/smpi/alltoall_basic.c                     |  2 ++
 teshsuite/smpi/mpich3-test/attr/attrerr.c           |  1 +
 teshsuite/smpi/mpich3-test/attr/attrerrcomm.c       |  1 +
 teshsuite/smpi/mpich3-test/attr/attrerrtype.c       |  1 +
 teshsuite/smpi/mpich3-test/attr/attric.c            |  4 ++++
 teshsuite/smpi/mpich3-test/attr/attrt.c             | 12 ++++++++++++
 teshsuite/smpi/mpich3-test/coll/allgatherv4.c       |  2 ++
 teshsuite/smpi/mpich3-test/coll/allred.c            |  2 ++
 teshsuite/smpi/mpich3-test/coll/allred3.c           |  2 ++
 teshsuite/smpi/mpich3-test/coll/allred4.c           |  2 ++
 teshsuite/smpi/mpich3-test/coll/allred5.c           |  1 +
 teshsuite/smpi/mpich3-test/coll/alltoall1.c         |  1 +
 teshsuite/smpi/mpich3-test/coll/alltoallv.c         |  3 +++
 teshsuite/smpi/mpich3-test/coll/alltoallv0.c        |  2 ++
 teshsuite/smpi/mpich3-test/coll/alltoallw2.c        |  3 +++
 teshsuite/smpi/mpich3-test/coll/coll13.c            |  3 +++
 teshsuite/smpi/mpich3-test/coll/coll2.c             |  1 +
 teshsuite/smpi/mpich3-test/coll/coll3.c             |  1 +
 teshsuite/smpi/mpich3-test/coll/coll6.c             |  1 +
 teshsuite/smpi/mpich3-test/coll/coll7.c             |  1 +
 teshsuite/smpi/mpich3-test/coll/icalltoallv.c       |  2 ++
 teshsuite/smpi/mpich3-test/coll/icalltoallw.c       |  2 ++
 teshsuite/smpi/mpich3-test/coll/nonblocking.c       |  1 +
 teshsuite/smpi/mpich3-test/coll/nonblocking2.c      |  1 +
 teshsuite/smpi/mpich3-test/coll/nonblocking3.c      |  1 +
 teshsuite/smpi/mpich3-test/coll/red3.c              | 10 ++++++++--
 teshsuite/smpi/mpich3-test/coll/red4.c              | 10 ++++++++--
 teshsuite/smpi/mpich3-test/coll/red_scat_block.c    |  1 +
 teshsuite/smpi/mpich3-test/coll/redscat3.c          |  3 +++
 teshsuite/smpi/mpich3-test/coll/redscatbkinter.c    |  2 ++
 teshsuite/smpi/mpich3-test/coll/redscatblk3.c       |  2 ++
 teshsuite/smpi/mpich3-test/coll/redscatinter.c      |  3 +++
 teshsuite/smpi/mpich3-test/coll/scatterv.c          |  2 ++
 teshsuite/smpi/mpich3-test/coll/uoplong.c           |  1 +
 teshsuite/smpi/mpich3-test/comm/cmfree.c            |  1 +
 teshsuite/smpi/mpich3-test/comm/cmsplit.c           |  1 +
 teshsuite/smpi/mpich3-test/comm/comm_create_group.c |  1 +
 teshsuite/smpi/mpich3-test/comm/comm_idup.c         |  1 +
 teshsuite/smpi/mpich3-test/comm/commcreate1.c       |  1 +
 teshsuite/smpi/mpich3-test/comm/ic1.c               |  1 +
 teshsuite/smpi/mpich3-test/comm/ic2.c               |  2 +-
 teshsuite/smpi/mpich3-test/comm/iccreate.c          |  1 +
 teshsuite/smpi/mpich3-test/comm/icsplit.c           |  1 +
 teshsuite/smpi/mpich3-test/comm/probe-intercomm.c   |  1 +
 teshsuite/smpi/mpich3-test/datatype/darray-cyclic.c | 10 ++++++++++
 teshsuite/smpi/mpich3-test/datatype/getpartelm.c    |  1 +
 teshsuite/smpi/mpich3-test/datatype/struct-ezhov.c  |  1 +
 teshsuite/smpi/mpich3-test/datatype/tfree.c         |  1 +
 teshsuite/smpi/mpich3-test/datatype/tresized.c      |  1 +
 teshsuite/smpi/mpich3-test/datatype/tresized2.c     |  1 +
 teshsuite/smpi/mpich3-test/f90/datatype/indtype.f90 |  1 +
 teshsuite/smpi/mpich3-test/f90/datatype/structf.f90 |  1 +
 teshsuite/smpi/mpich3-test/group/gtranks.c          |  2 ++
 teshsuite/smpi/mpich3-test/group/gtranksperf.c      |  1 +
 teshsuite/smpi/mpich3-test/pt2pt/bottom.c           |  1 +
 teshsuite/smpi/mpich3-test/pt2pt/bsendfrag.c        |  2 ++
 teshsuite/smpi/mpich3-test/pt2pt/bsendpending.c     |  1 +
 teshsuite/smpi/mpich3-test/pt2pt/cancelrecv.c       |  2 ++
 teshsuite/smpi/mpich3-test/pt2pt/eagerdt.c          |  1 +
 teshsuite/smpi/mpich3-test/pt2pt/large_message.c    |  1 +
 teshsuite/smpi/mpich3-test/pt2pt/mprobe.c           |  1 +
 teshsuite/smpi/mpich3-test/pt2pt/pscancel.c         |  9 +++++++++
 teshsuite/smpi/mpich3-test/pt2pt/rqfreeb.c          |  1 +
 teshsuite/smpi/mpich3-test/pt2pt/scancel.c          |  9 +++++++++
 teshsuite/smpi/mpich3-test/pt2pt/scancel2.c         |  1 +
 teshsuite/smpi/mpich3-test/pt2pt/sendall.c          |  1 +
 teshsuite/smpi/mpich3-test/pt2pt/sendrecv3.c        |  2 ++
 teshsuite/smpi/mpich3-test/util/mtest.c             |  1 +
 69 files changed, 151 insertions(+), 5 deletions(-)

diff --git a/examples/smpi/NAS/FT/ft.f b/examples/smpi/NAS/FT/ft.f
index 8ab25b9780..5e3a3b0b40 100644
--- a/examples/smpi/NAS/FT/ft.f
+++ b/examples/smpi/NAS/FT/ft.f
@@ -389,6 +389,7 @@ c---------------------------------------------------------------------
                write(*, 239) np1*np2, np
  239           format(' Product is ', i5, ' and should be ', i5)
                call MPI_Abort(MPI_COMM_WORLD, 1, ierr)
+               stop
             endif
 
 c---------------------------------------------------------------------
@@ -402,6 +403,7 @@ c---------------------------------------------------------------------
  240           format(' Layout type specified in inputft.data is 
      >                  invalid ')
                call MPI_Abort(MPI_COMM_WORLD, 1, ierr)
+               stop
             endif
 
 c---------------------------------------------------------------------
@@ -413,6 +415,7 @@ c---------------------------------------------------------------------
                write(*, 241)
  241           format(' For 0D layout, both np1 and np2 must be 1 ')
                call MPI_Abort(MPI_COMM_WORLD, 1, ierr)
+               stop
             endif
 c---------------------------------------------------------------------
 c 4. 1D layout must be 1xN grid
@@ -422,6 +425,7 @@ c---------------------------------------------------------------------
                write(*, 242)
  242           format(' For 1D layout, np1 must be 1 ')
                call MPI_Abort(MPI_COMM_WORLD, 1, ierr)
+               stop
             endif
 
          else
@@ -448,6 +452,7 @@ c---------------------------------------------------------------------
             write(*, 11) np
  11         format(' Only ',  i5, ' processors found ')
             call MPI_Abort(MPI_COMM_WORLD, 1, ierr)
+            stop
          endif
 
  234     format(' No input file inputft.data. Using compiled defaults')
diff --git a/teshsuite/smpi/alltoall_basic.c b/teshsuite/smpi/alltoall_basic.c
index 90cc4aad61..c3af311b85 100644
--- a/teshsuite/smpi/alltoall_basic.c
+++ b/teshsuite/smpi/alltoall_basic.c
@@ -32,6 +32,7 @@ int main(int argc, char *argv[])
     perror("can't allocate send buffer");
     fflush(stderr);
     MPI_Abort(MPI_COMM_WORLD, EXIT_FAILURE);
+    exit(EXIT_FAILURE);
   }
   rb = (int *) malloc(size * sizeof(int));
   if (!rb) {
@@ -39,6 +40,7 @@ int main(int argc, char *argv[])
     fflush(stderr);
     free(sb);
     MPI_Abort(MPI_COMM_WORLD, EXIT_FAILURE);
+    exit(EXIT_FAILURE);
   }
   for (i = 0; i < size; ++i) {
     sb[i] = rank + 1;
diff --git a/teshsuite/smpi/mpich3-test/attr/attrerr.c b/teshsuite/smpi/mpich3-test/attr/attrerr.c
index 39e361173f..907e4a53f3 100644
--- a/teshsuite/smpi/mpich3-test/attr/attrerr.c
+++ b/teshsuite/smpi/mpich3-test/attr/attrerr.c
@@ -63,6 +63,7 @@ void abort_msg( const char *str, int code )
 {
     fprintf( stderr, "%s, err = %d\n", str, code );
     MPI_Abort( MPI_COMM_WORLD, code );
+    exit(code);
 }
 
 int test_communicators( void )
diff --git a/teshsuite/smpi/mpich3-test/attr/attrerrcomm.c b/teshsuite/smpi/mpich3-test/attr/attrerrcomm.c
index df42e48c65..9384dd4a94 100644
--- a/teshsuite/smpi/mpich3-test/attr/attrerrcomm.c
+++ b/teshsuite/smpi/mpich3-test/attr/attrerrcomm.c
@@ -63,6 +63,7 @@ void abort_msg( const char *str, int code )
 {
     fprintf( stderr, "%s, err = %d\n", str, code );
     MPI_Abort( MPI_COMM_WORLD, code );
+    exit(code);
 }
 
 int test_communicators( void )
diff --git a/teshsuite/smpi/mpich3-test/attr/attrerrtype.c b/teshsuite/smpi/mpich3-test/attr/attrerrtype.c
index d3d9a39de6..19a27cbbed 100644
--- a/teshsuite/smpi/mpich3-test/attr/attrerrtype.c
+++ b/teshsuite/smpi/mpich3-test/attr/attrerrtype.c
@@ -65,6 +65,7 @@ void abort_msg( const char *str, int code )
 {
     fprintf( stderr, "%s, err = %d\n", str, code );
     MPI_Abort( MPI_COMM_WORLD, code );
+    exit(code);
 }
 
 int test_attrs( void )
diff --git a/teshsuite/smpi/mpich3-test/attr/attric.c b/teshsuite/smpi/mpich3-test/attr/attric.c
index c71e96c6c7..9b3b04c723 100644
--- a/teshsuite/smpi/mpich3-test/attr/attric.c
+++ b/teshsuite/smpi/mpich3-test/attr/attric.c
@@ -57,6 +57,7 @@ int delete_fn( MPI_Comm comm, int keyval, void *attribute_val,
     if ((MPI_Aint)attribute_val != (MPI_Aint)world_rank) {
 	printf( "incorrect attribute value %d\n", *(int*)attribute_val );
 	MPI_Abort(MPI_COMM_WORLD, 1005 );
+        exit(1005);
     }
     return MPI_SUCCESS;
 }
@@ -120,6 +121,7 @@ int test_communicators( void )
 	    printf( "dup_comm key_1 not found on %d\n", world_rank );
 	    fflush( stdout );
 	    MPI_Abort(MPI_COMM_WORLD, 3004 );
+            exit(3004);
 	}
 	
 	if (value != world_rank) {
@@ -127,6 +129,7 @@ int test_communicators( void )
 	    printf( "dup_comm key_1 value incorrect: %ld\n", (long)value );
 	    fflush( stdout );
 	    MPI_Abort(MPI_COMM_WORLD, 3005 );
+            exit(3005);
 	}
 
 	MPI_Attr_get(dup_comm, key_3, (void **)&vvalue, &flag );
@@ -136,6 +139,7 @@ int test_communicators( void )
 	    printf( "dup_comm key_3 found!\n" );
 	    fflush( stdout );
 	    MPI_Abort(MPI_COMM_WORLD, 3008 );
+            exit(3008);
 	}
         MTestPrintfMsg(1, "Keyval_free key=%#x\n", key_1);
 	MPI_Keyval_free(&key_1 );
diff --git a/teshsuite/smpi/mpich3-test/attr/attrt.c b/teshsuite/smpi/mpich3-test/attr/attrt.c
index 4a94201cb1..c52491dd67 100644
--- a/teshsuite/smpi/mpich3-test/attr/attrt.c
+++ b/teshsuite/smpi/mpich3-test/attr/attrt.c
@@ -55,6 +55,7 @@ int delete_fn( MPI_Comm comm, int keyval, void *attribute_val,
     if ((MPI_Aint)attribute_val != (MPI_Aint)world_rank) {
 	printf( "incorrect attribute value %d\n", *(int*)attribute_val );
 	MPI_Abort(MPI_COMM_WORLD, 1005 );
+        exit(1005);
     }
     return MPI_SUCCESS;
 }
@@ -99,6 +100,7 @@ int test_communicators( void )
 	errs++;
 	printf( "incorrect rank in world comm: %d\n", rank );
 	MPI_Abort(MPI_COMM_WORLD, 3001 );
+        exit(3001);
     }
 
     n = world_size / 2;
@@ -130,6 +132,7 @@ int test_communicators( void )
 	    errs++;
 	    printf( "incorrect lo group rank: %d\n", rank ); fflush(stdout);
 	    MPI_Abort(MPI_COMM_WORLD, 3002 );
+            exit(3002);
 	}
 	else {
 	    /* printf( "lo in\n" );FFLUSH; */
@@ -142,6 +145,7 @@ int test_communicators( void )
 	    errs++;
 	    printf( "rank : %d incorrect lo comm:\n", rank ); fflush(stdout);
 	    MPI_Abort(MPI_COMM_WORLD, 3003 );
+            exit(3003);
 	}
     }
 
@@ -192,6 +196,7 @@ int test_communicators( void )
 	    printf( "dup_comm key_1 not found on %d\n", world_rank );
 	    fflush( stdout );
 	    MPI_Abort(MPI_COMM_WORLD, 3004 );
+            exit(3004);
 	}
 	
 	if (value != world_rank) {
@@ -200,6 +205,7 @@ int test_communicators( void )
 		    (long)value, world_rank );
 	    fflush( stdout );
 	    MPI_Abort(MPI_COMM_WORLD, 3005 );
+            exit(3005);
 	}
 
 	MPI_Attr_get(dup_comm, key_3, (void **)&vvalue, &flag );
@@ -209,6 +215,7 @@ int test_communicators( void )
 	    printf( "dup_comm key_3 found!\n" );
 	    fflush( stdout );
 	    MPI_Abort(MPI_COMM_WORLD, 3008 );
+            exit(3008);
 	}
 	MPI_Keyval_free(&key_1 );
 	MPI_Keyval_free(&key_3 );
@@ -233,6 +240,7 @@ int test_communicators( void )
 	errs++;
 	printf( "incorrect split rank: %d\n", rank ); fflush(stdout);
 	MPI_Abort(MPI_COMM_WORLD, 3009 );
+        exit(3009);
     }
     
     MPI_Barrier(split_comm );
@@ -251,6 +259,7 @@ int test_communicators( void )
 	errs++;
 	printf( "incorrect ident result: %d\n", result );
 	MPI_Abort(MPI_COMM_WORLD, 3010 );
+        exit(3010);
     }
     
     if (lo_comm != MPI_COMM_NULL) {
@@ -259,6 +268,7 @@ int test_communicators( void )
 	    errs++;
             printf( "incorrect congruent result: %d\n", result );
             MPI_Abort(MPI_COMM_WORLD, 3011 );
+            exit(3011);
 	}
     }
     
@@ -274,6 +284,7 @@ int test_communicators( void )
 	errs++;
 	printf( "incorrect similar result: %d\n", result );
 	MPI_Abort(MPI_COMM_WORLD, 3012 );
+        exit(3012);
     }
     
     if (lo_comm != MPI_COMM_NULL) {
@@ -282,6 +293,7 @@ int test_communicators( void )
 	    errs++;
 	    printf( "incorrect unequal result: %d\n", result );
 	    MPI_Abort(MPI_COMM_WORLD, 3013 );
+            exit(3013);
 	}
     }
     /*
diff --git a/teshsuite/smpi/mpich3-test/coll/allgatherv4.c b/teshsuite/smpi/mpich3-test/coll/allgatherv4.c
index 963fd36f31..2ce422a871 100644
--- a/teshsuite/smpi/mpich3-test/coll/allgatherv4.c
+++ b/teshsuite/smpi/mpich3-test/coll/allgatherv4.c
@@ -71,6 +71,7 @@ int main(int argc, char ** argv)
 	if (!displs) fprintf(stderr,"\tdispls of %zd bytes\n", comm_size * sizeof(int) );
         fflush(stderr);
         MPI_Abort(MPI_COMM_WORLD, -1);
+        exit(-1);
     }
 
     if (!comm_rank) {
@@ -200,6 +201,7 @@ double run_test(long long msg_size, MPI_Comm comm, test_t test_type,
 	    if (tmp != (int)tmp) {
 		fprintf( stderr, "Integer overflow in variable tmp\n" );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
             recvcounts[i] = (int) tmp;
 
diff --git a/teshsuite/smpi/mpich3-test/coll/allred.c b/teshsuite/smpi/mpich3-test/coll/allred.c
index d33f876849..e9becde7a1 100644
--- a/teshsuite/smpi/mpich3-test/coll/allred.c
+++ b/teshsuite/smpi/mpich3-test/coll/allred.c
@@ -368,6 +368,7 @@ int main( int argc, char **argv )
     if (size < 2) {
 	fprintf( stderr, "At least 2 processes required\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     /* Set errors return so that we can provide better information 
@@ -383,6 +384,7 @@ int main( int argc, char **argv )
 	if  (count <= 0) {
 	    fprintf( stderr, "Invalid count argument %s\n", argv[1] );
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
     }
 
diff --git a/teshsuite/smpi/mpich3-test/coll/allred3.c b/teshsuite/smpi/mpich3-test/coll/allred3.c
index aaf8a23354..cf16324e56 100644
--- a/teshsuite/smpi/mpich3-test/coll/allred3.c
+++ b/teshsuite/smpi/mpich3-test/coll/allred3.c
@@ -182,10 +182,12 @@ int main( int argc, char *argv[] )
 	buf = (int *)malloc( max_offset * sizeof(int) );
 	if (!buf) {
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
 	bufout = (int *)malloc( max_offset * sizeof(int) );
 	if (!bufout) {
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
 
 	initMat( comm, buf );
diff --git a/teshsuite/smpi/mpich3-test/coll/allred4.c b/teshsuite/smpi/mpich3-test/coll/allred4.c
index 32e0c00ae1..1638657ddf 100644
--- a/teshsuite/smpi/mpich3-test/coll/allred4.c
+++ b/teshsuite/smpi/mpich3-test/coll/allred4.c
@@ -198,11 +198,13 @@ int main( int argc, char *argv[] )
 	    buf = (int *)malloc( count * 9 * sizeof(int) );
 	    if (!buf) {
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 
 	    bufout = (int *)malloc( count * 9 * sizeof(int) );
 	    if (!bufout) {
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 
 	    for (i=0; i < count; i++) {
diff --git a/teshsuite/smpi/mpich3-test/coll/allred5.c b/teshsuite/smpi/mpich3-test/coll/allred5.c
index a442550849..7bba665d0e 100644
--- a/teshsuite/smpi/mpich3-test/coll/allred5.c
+++ b/teshsuite/smpi/mpich3-test/coll/allred5.c
@@ -38,6 +38,7 @@ int main( int argc, char *argv[] )
 	    fprintf( stderr, "Unable to allocated space for buffers (%d)\n",
 		     count );
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
 	for (i=0; i<count; i++) {
 	    bufin[i] = i;
diff --git a/teshsuite/smpi/mpich3-test/coll/alltoall1.c b/teshsuite/smpi/mpich3-test/coll/alltoall1.c
index cd6d3d8681..3e2a069e67 100644
--- a/teshsuite/smpi/mpich3-test/coll/alltoall1.c
+++ b/teshsuite/smpi/mpich3-test/coll/alltoall1.c
@@ -53,6 +53,7 @@ int main( int argc, char *argv[] )
 		errs++;
 		fprintf( stderr, "Failed to allocate sendbuf and/or recvbuf\n" );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 	    for (i=0; i<count*size; i++) 
 		recvbuf[i] = -1;
diff --git a/teshsuite/smpi/mpich3-test/coll/alltoallv.c b/teshsuite/smpi/mpich3-test/coll/alltoallv.c
index bcae133e55..484ebf736d 100644
--- a/teshsuite/smpi/mpich3-test/coll/alltoallv.c
+++ b/teshsuite/smpi/mpich3-test/coll/alltoallv.c
@@ -45,6 +45,7 @@ int main( int argc, char **argv )
       if (!sbuf || !rbuf) {
 	fprintf( stderr, "Could not allocated buffers!\n" );
 	MPI_Abort( comm, 1 );
+        exit(1);
       }
       
       /* Load up the buffers */
@@ -61,6 +62,7 @@ int main( int argc, char **argv )
       if (!sendcounts || !recvcounts || !rdispls || !sdispls) {
 	fprintf( stderr, "Could not allocate arg items!\n" );
 	MPI_Abort( comm, 1 );
+        exit(1);
       }
       for (i=0; i<size; i++) {
 	sendcounts[i] = i;
@@ -94,6 +96,7 @@ int main( int argc, char **argv )
       if (!rbuf) {
         fprintf( stderr, "Could not reallocate rbuf!\n" );
         MPI_Abort( comm, 1 );
+        exit(1);
       }
 
       /* Load up the buffers */
diff --git a/teshsuite/smpi/mpich3-test/coll/alltoallv0.c b/teshsuite/smpi/mpich3-test/coll/alltoallv0.c
index e1c878551b..5890043dd7 100644
--- a/teshsuite/smpi/mpich3-test/coll/alltoallv0.c
+++ b/teshsuite/smpi/mpich3-test/coll/alltoallv0.c
@@ -49,6 +49,7 @@ int main( int argc, char **argv )
       if (!sendcounts || !recvcounts || !rdispls || !sdispls) {
 	fprintf( stderr, "Could not allocate arg items!\n" );
 	MPI_Abort( comm, 1 );
+        exit(1);
       }
 
       /* Get the neighbors */
@@ -70,6 +71,7 @@ int main( int argc, char **argv )
 	  if (!sbuf || !rbuf) {
 	      fprintf( stderr, "Could not allocate buffers!\n" );
 	      MPI_Abort( comm, 1 );
+              exit(1);
 	  }
 	  
 	  /* Load up the buffers */
diff --git a/teshsuite/smpi/mpich3-test/coll/alltoallw2.c b/teshsuite/smpi/mpich3-test/coll/alltoallw2.c
index 7d40236f41..b3a000f3f6 100644
--- a/teshsuite/smpi/mpich3-test/coll/alltoallw2.c
+++ b/teshsuite/smpi/mpich3-test/coll/alltoallw2.c
@@ -47,6 +47,7 @@ int main( int argc, char **argv )
       if (!sbuf || !rbuf) {
 	fprintf( stderr, "Could not allocated buffers!\n" );
 	MPI_Abort( comm, 1 );
+        exit(1);
       }
       
       /* Load up the buffers */
@@ -65,6 +66,7 @@ int main( int argc, char **argv )
       if (!sendcounts || !recvcounts || !rdispls || !sdispls || !sendtypes || !recvtypes) {
 	fprintf( stderr, "Could not allocate arg items!\n" );
 	MPI_Abort( comm, 1 );
+        exit(1);
       }
       /* Note that process 0 sends no data (sendcounts[0] = 0) */
       for (i=0; i<size; i++) {
@@ -101,6 +103,7 @@ int main( int argc, char **argv )
       if (!rbuf) {
         fprintf( stderr, "Could not reallocate rbuf!\n" );
         MPI_Abort( comm, 1 );
+        exit(1);
       }
 
       /* Load up the buffers */
diff --git a/teshsuite/smpi/mpich3-test/coll/coll13.c b/teshsuite/smpi/mpich3-test/coll/coll13.c
index 7e5b3c7181..6c0726913d 100644
--- a/teshsuite/smpi/mpich3-test/coll/coll13.c
+++ b/teshsuite/smpi/mpich3-test/coll/coll13.c
@@ -45,6 +45,7 @@ int main( int argc, char *argv[] )
 	    fprintf(stderr,"Unrecognized argument %s\n",
 		    argv[i]);
 	    MPI_Abort(MPI_COMM_WORLD,EXIT_FAILURE);
+            exit(EXIT_FAILURE);
 	}
     }
 
@@ -52,12 +53,14 @@ int main( int argc, char *argv[] )
     if ( !sb ) {
 	perror( "can't allocate send buffer" );
 	MPI_Abort(MPI_COMM_WORLD,EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
     rb = (int *)malloc(size*chunk*sizeof(int));
     if ( !rb ) {
 	perror( "can't allocate recv buffer");
 	free(sb);
 	MPI_Abort(MPI_COMM_WORLD,EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
     for ( i=0 ; i < size*chunk ; ++i ) {
 	sb[i] = rank + 1;
diff --git a/teshsuite/smpi/mpich3-test/coll/coll2.c b/teshsuite/smpi/mpich3-test/coll/coll2.c
index ae08c96bd7..008aa712b1 100644
--- a/teshsuite/smpi/mpich3-test/coll/coll2.c
+++ b/teshsuite/smpi/mpich3-test/coll/coll2.c
@@ -28,6 +28,7 @@ int main( int argc, char **argv )
 	fprintf( stderr, "Number of processors must divide %d\n",
 		MAX_PROCESSES );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
 	}
     if ( (rank < participants) ) {
 
diff --git a/teshsuite/smpi/mpich3-test/coll/coll3.c b/teshsuite/smpi/mpich3-test/coll/coll3.c
index 84260d1cdd..8fa5cdf153 100644
--- a/teshsuite/smpi/mpich3-test/coll/coll3.c
+++ b/teshsuite/smpi/mpich3-test/coll/coll3.c
@@ -30,6 +30,7 @@ int main( int argc, char **argv )
 	fprintf( stderr, "Number of processors must divide %d\n",
 		MAX_PROCESSES );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
 	}
     if ( (rank < participants) ) {
 
diff --git a/teshsuite/smpi/mpich3-test/coll/coll6.c b/teshsuite/smpi/mpich3-test/coll/coll6.c
index 6e8ea360f5..0ab19de075 100644
--- a/teshsuite/smpi/mpich3-test/coll/coll6.c
+++ b/teshsuite/smpi/mpich3-test/coll/coll6.c
@@ -30,6 +30,7 @@ int main( int argc, char **argv )
 	fprintf( stderr, "Number of processors must divide %d\n",
 		MAX_PROCESSES );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
 	}
     MPI_Comm_split(MPI_COMM_WORLD, rank<participants, rank, &test_comm);
 
diff --git a/teshsuite/smpi/mpich3-test/coll/coll7.c b/teshsuite/smpi/mpich3-test/coll/coll7.c
index 3d352ef76e..7cadacef15 100644
--- a/teshsuite/smpi/mpich3-test/coll/coll7.c
+++ b/teshsuite/smpi/mpich3-test/coll/coll7.c
@@ -27,6 +27,7 @@ int main( int argc, char **argv )
 	fprintf( stderr, "Number of processors must divide %d\n",
 		MAX_PROCESSES );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
 	}
     /* while (MAX_PROCESSES % participants) participants--; */
     if ( (rank < participants) ) {
diff --git a/teshsuite/smpi/mpich3-test/coll/icalltoallv.c b/teshsuite/smpi/mpich3-test/coll/icalltoallv.c
index 41123c3222..223392366a 100644
--- a/teshsuite/smpi/mpich3-test/coll/icalltoallv.c
+++ b/teshsuite/smpi/mpich3-test/coll/icalltoallv.c
@@ -46,6 +46,7 @@ int main( int argc, char **argv )
       if (!sbuf || !rbuf) {
 	fprintf( stderr, "Could not allocated buffers!\n" );
 	MPI_Abort( comm, 1 );
+        exit(1);
       }
 
       /* Load up the buffers */
@@ -62,6 +63,7 @@ int main( int argc, char **argv )
       if (!sendcounts || !recvcounts || !rdispls || !sdispls) {
 	fprintf( stderr, "Could not allocate arg items!\n" );
 	MPI_Abort( comm, 1 );
+        exit(1);
       }
       for (i=0; i<size; i++) {
 	sendcounts[i] = i;
diff --git a/teshsuite/smpi/mpich3-test/coll/icalltoallw.c b/teshsuite/smpi/mpich3-test/coll/icalltoallw.c
index 2b8252ea35..745bbb1681 100644
--- a/teshsuite/smpi/mpich3-test/coll/icalltoallw.c
+++ b/teshsuite/smpi/mpich3-test/coll/icalltoallw.c
@@ -49,6 +49,7 @@ int main( int argc, char **argv )
       if (!sbuf || !rbuf) {
 	fprintf( stderr, "Could not allocated buffers!\n" );
 	MPI_Abort( comm, 1 );
+        exit(1);
       }
       
       /* Load up the buffers */
@@ -67,6 +68,7 @@ int main( int argc, char **argv )
       if (!sendcounts || !recvcounts || !rdispls || !sdispls || !sendtypes || !recvtypes) {
 	fprintf( stderr, "Could not allocate arg items!\n" );
 	MPI_Abort( comm, 1 );
+        exit(1);
       }
       /* Note that process 0 sends no data (sendcounts[0] = 0) */
       for (i=0; i<size; i++) {
diff --git a/teshsuite/smpi/mpich3-test/coll/nonblocking.c b/teshsuite/smpi/mpich3-test/coll/nonblocking.c
index 8f49a99ad7..97cfa58da9 100644
--- a/teshsuite/smpi/mpich3-test/coll/nonblocking.c
+++ b/teshsuite/smpi/mpich3-test/coll/nonblocking.c
@@ -27,6 +27,7 @@
         if (!(cond_)) {                                                   \
             fprintf(stderr, "assertion (%s) failed, aborting\n", #cond_); \
             MPI_Abort(MPI_COMM_WORLD, 1);                                 \
+            exit(1);                                                      \
         }                                                                 \
     } while (0)
 
diff --git a/teshsuite/smpi/mpich3-test/coll/nonblocking2.c b/teshsuite/smpi/mpich3-test/coll/nonblocking2.c
index bc8a2c270a..e607fadb1b 100644
--- a/teshsuite/smpi/mpich3-test/coll/nonblocking2.c
+++ b/teshsuite/smpi/mpich3-test/coll/nonblocking2.c
@@ -25,6 +25,7 @@
         if (!(cond_)) {                                                   \
             fprintf(stderr, "assertion (%s) failed, aborting\n", #cond_); \
             MPI_Abort(MPI_COMM_WORLD, 1);                                 \
+            exit(1);                                                      \
         }                                                                 \
     } while (0)
 
diff --git a/teshsuite/smpi/mpich3-test/coll/nonblocking3.c b/teshsuite/smpi/mpich3-test/coll/nonblocking3.c
index 2c0ab32ba6..2afbc575d0 100644
--- a/teshsuite/smpi/mpich3-test/coll/nonblocking3.c
+++ b/teshsuite/smpi/mpich3-test/coll/nonblocking3.c
@@ -405,6 +405,7 @@ static void start_random_nonblocking(MPI_Comm comm, unsigned int rndnum, MPI_Req
         default:
             fprintf(stderr, "unexpected value for l->case_num=%d)\n", (l->case_num));
             MPI_Abort(comm, 1);
+            exit(1);
             break;
     }
 }
diff --git a/teshsuite/smpi/mpich3-test/coll/red3.c b/teshsuite/smpi/mpich3-test/coll/red3.c
index 32358d992d..a13561cc56 100644
--- a/teshsuite/smpi/mpich3-test/coll/red3.c
+++ b/teshsuite/smpi/mpich3-test/coll/red3.c
@@ -160,9 +160,15 @@ int main( int argc, char *argv[] )
 	MPI_Type_commit( &mattype );
 	
 	buf = (int *)malloc( count * size * size * sizeof(int) );
-	if (!buf) MPI_Abort( MPI_COMM_WORLD, 1 );
+	if (!buf) {
+          MPI_Abort( MPI_COMM_WORLD, 1 );
+          exit(1);
+        }
 	bufout = (int *)malloc( count * size * size * sizeof(int) );
-	if (!bufout) MPI_Abort( MPI_COMM_WORLD, 1 );
+	if (!bufout) {
+          MPI_Abort( MPI_COMM_WORLD, 1 );
+          exit(1);
+        }
 
 	for (root = 0; root < size; root ++) {
 	    initMat( comm, buf );
diff --git a/teshsuite/smpi/mpich3-test/coll/red4.c b/teshsuite/smpi/mpich3-test/coll/red4.c
index a3e91831b2..abef5a8643 100644
--- a/teshsuite/smpi/mpich3-test/coll/red4.c
+++ b/teshsuite/smpi/mpich3-test/coll/red4.c
@@ -220,9 +220,15 @@ int main( int argc, char *argv[] )
 	MPI_Type_commit( &mattype );
 	
 	buf = (int *)malloc( count * size * size * sizeof(int) );
-	if (!buf) MPI_Abort( MPI_COMM_WORLD, 1 );
+	if (!buf) {
+          MPI_Abort( MPI_COMM_WORLD, 1 );
+          exit(1);
+        }
 	bufout = (int *)malloc( count * size * size * sizeof(int) );
-	if (!bufout) MPI_Abort( MPI_COMM_WORLD, 1 );
+	if (!bufout) {
+          MPI_Abort( MPI_COMM_WORLD, 1 );
+          exit(1);
+        }
 
 	for (root = 0; root < size; root ++) {
 	    initMat( comm, buf );
diff --git a/teshsuite/smpi/mpich3-test/coll/red_scat_block.c b/teshsuite/smpi/mpich3-test/coll/red_scat_block.c
index 7891cb6efc..71886e4f8b 100644
--- a/teshsuite/smpi/mpich3-test/coll/red_scat_block.c
+++ b/teshsuite/smpi/mpich3-test/coll/red_scat_block.c
@@ -42,6 +42,7 @@ int main(int argc, char **argv)
         err++;
         fprintf(stderr, "unable to allocate send/recv buffers, aborting");
         MPI_Abort(MPI_COMM_WORLD, 1);
+        exit(1);
     }
     for (i=0; i<size; i++)
         sendbuf[i] = rank + i;
diff --git a/teshsuite/smpi/mpich3-test/coll/redscat3.c b/teshsuite/smpi/mpich3-test/coll/redscat3.c
index d2ed7ecc29..9d3b7ad6ee 100644
--- a/teshsuite/smpi/mpich3-test/coll/redscat3.c
+++ b/teshsuite/smpi/mpich3-test/coll/redscat3.c
@@ -39,6 +39,7 @@ int main( int argc, char **argv )
 	fprintf( stderr, "Could not allocate %d ints for recvcounts\n", 
 		 size );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     mycount = (1024 * 1024) / size;
     for (i=0; i<size; i++) 
@@ -48,6 +49,7 @@ int main( int argc, char **argv )
 	fprintf( stderr, "Could not allocate %d ints for sendbuf\n", 
 		 mycount * size );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     idx = 0;
     for (i=0; i<size; i++) {
@@ -60,6 +62,7 @@ int main( int argc, char **argv )
 	fprintf( stderr, "Could not allocate %d ints for recvbuf\n", 
 		 mycount );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     for (i=0; i<mycount; i++) {
 	recvbuf[i] = -1;
diff --git a/teshsuite/smpi/mpich3-test/coll/redscatbkinter.c b/teshsuite/smpi/mpich3-test/coll/redscatbkinter.c
index bf5f65fd65..5810b5b5c8 100644
--- a/teshsuite/smpi/mpich3-test/coll/redscatbkinter.c
+++ b/teshsuite/smpi/mpich3-test/coll/redscatbkinter.c
@@ -58,6 +58,7 @@ int main( int argc, char **argv )
 	    fprintf( stderr, "Could not allocate %d ints for sendbuf\n", 
 		     sendcount );
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
 
 	for (i=0; i<sendcount; i++) {
@@ -68,6 +69,7 @@ int main( int argc, char **argv )
 	    fprintf( stderr, "Could not allocate %d ints for recvbuf\n", 
 		     recvcount );
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
 	for (i=0; i<recvcount; i++) {
 	    recvbuf[i] = (long long)(-i);
diff --git a/teshsuite/smpi/mpich3-test/coll/redscatblk3.c b/teshsuite/smpi/mpich3-test/coll/redscatblk3.c
index 5fb81e510b..8341082a92 100644
--- a/teshsuite/smpi/mpich3-test/coll/redscatblk3.c
+++ b/teshsuite/smpi/mpich3-test/coll/redscatblk3.c
@@ -38,6 +38,7 @@ int main( int argc, char **argv )
 	fprintf( stderr, "Could not allocate %d ints for sendbuf\n", 
 		 mycount * size );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     idx = 0;
     for (i=0; i<size; i++) {
@@ -50,6 +51,7 @@ int main( int argc, char **argv )
 	fprintf( stderr, "Could not allocate %d ints for recvbuf\n", 
 		 mycount );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     MPI_Reduce_scatter_block( sendbuf, recvbuf, mycount, MPI_INT, MPI_SUM, 
diff --git a/teshsuite/smpi/mpich3-test/coll/redscatinter.c b/teshsuite/smpi/mpich3-test/coll/redscatinter.c
index bebfd8a75c..f54da3c8d9 100644
--- a/teshsuite/smpi/mpich3-test/coll/redscatinter.c
+++ b/teshsuite/smpi/mpich3-test/coll/redscatinter.c
@@ -59,6 +59,7 @@ int main( int argc, char **argv )
 	    fprintf( stderr, "Could not allocate %d int for recvcounts\n", 
 		     size );
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
 	for (i=0; i<size; i++) 
 	    recvcounts[i] = recvcount;
@@ -68,6 +69,7 @@ int main( int argc, char **argv )
 	    fprintf( stderr, "Could not allocate %d ints for sendbuf\n", 
 		     sendcount );
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
 
 	for (i=0; i<sendcount; i++) {
@@ -78,6 +80,7 @@ int main( int argc, char **argv )
 	    fprintf( stderr, "Could not allocate %d ints for recvbuf\n", 
 		     recvcount );
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
 	for (i=0; i<recvcount; i++) {
 	    recvbuf[i] = (long long)(-i);
diff --git a/teshsuite/smpi/mpich3-test/coll/scatterv.c b/teshsuite/smpi/mpich3-test/coll/scatterv.c
index 6d8aa9454b..ea80da0f39 100644
--- a/teshsuite/smpi/mpich3-test/coll/scatterv.c
+++ b/teshsuite/smpi/mpich3-test/coll/scatterv.c
@@ -119,12 +119,14 @@ int main( int argc, char **argv )
     recvbuf = (double *)malloc( nx * ny * sizeof(double) );
     if (!recvbuf) {
         MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     sendbuf = 0;
     if (myrow == 0 && mycol == 0) {
         sendbuf = (double *)malloc( nx * ny * size * sizeof(double) );
         if (!sendbuf) {
             MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
         }
     }
     sendcounts = (int *) malloc( size * sizeof(int) );
diff --git a/teshsuite/smpi/mpich3-test/coll/uoplong.c b/teshsuite/smpi/mpich3-test/coll/uoplong.c
index 39f857db98..3d6ca7e68a 100644
--- a/teshsuite/smpi/mpich3-test/coll/uoplong.c
+++ b/teshsuite/smpi/mpich3-test/coll/uoplong.c
@@ -65,6 +65,7 @@ int main( int argc, char *argv[] )
 	    fprintf( stderr, "Unable to allocated %d words for data\n", 
 		     3 * count );
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
 	for (i=0; i<count*3; i++) {
 	    outVal[i] = -1;
diff --git a/teshsuite/smpi/mpich3-test/comm/cmfree.c b/teshsuite/smpi/mpich3-test/comm/cmfree.c
index df377720b4..99e99c1f57 100644
--- a/teshsuite/smpi/mpich3-test/comm/cmfree.c
+++ b/teshsuite/smpi/mpich3-test/comm/cmfree.c
@@ -44,6 +44,7 @@ int main( int argc, char *argv[] )
     if (size < 2) {
 	fprintf( stderr, "This test requires at least two processes." );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     source  = 0;
diff --git a/teshsuite/smpi/mpich3-test/comm/cmsplit.c b/teshsuite/smpi/mpich3-test/comm/cmsplit.c
index c5f103edba..cd14521685 100644
--- a/teshsuite/smpi/mpich3-test/comm/cmsplit.c
+++ b/teshsuite/smpi/mpich3-test/comm/cmsplit.c
@@ -29,6 +29,7 @@ int main( int argc, char *argv[] )
     if (size < 4) {
 	fprintf( stderr, "This test requires at least four processes." );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     color = MPI_UNDEFINED;
diff --git a/teshsuite/smpi/mpich3-test/comm/comm_create_group.c b/teshsuite/smpi/mpich3-test/comm/comm_create_group.c
index edce6bb5a3..8dc1df3588 100644
--- a/teshsuite/smpi/mpich3-test/comm/comm_create_group.c
+++ b/teshsuite/smpi/mpich3-test/comm/comm_create_group.c
@@ -25,6 +25,7 @@ int main(int argc, char *argv[])
     if (size % 2) {
         fprintf(stderr, "this program requires a multiple of 2 number of processes\n");
         MPI_Abort(MPI_COMM_WORLD, 1);
+        exit(1);
     }
 
     excl = malloc((size / 2) * sizeof(int));
diff --git a/teshsuite/smpi/mpich3-test/comm/comm_idup.c b/teshsuite/smpi/mpich3-test/comm/comm_idup.c
index 0823943794..1a56bd6108 100644
--- a/teshsuite/smpi/mpich3-test/comm/comm_idup.c
+++ b/teshsuite/smpi/mpich3-test/comm/comm_idup.c
@@ -45,6 +45,7 @@ int main(int argc, char **argv)
     if (size < 2) {
         printf("this test requires at least 2 processes\n");
         MPI_Abort(MPI_COMM_WORLD, 1);
+        exit(1);
     }
 
 #ifdef TEST_IDUP
diff --git a/teshsuite/smpi/mpich3-test/comm/commcreate1.c b/teshsuite/smpi/mpich3-test/comm/commcreate1.c
index edb60fdda2..e93f914e39 100644
--- a/teshsuite/smpi/mpich3-test/comm/commcreate1.c
+++ b/teshsuite/smpi/mpich3-test/comm/commcreate1.c
@@ -25,6 +25,7 @@ void abortMsg( const char *str, int code )
     fprintf( stderr, "%s: errcode = %d, class = %d, msg = %s\n", 
 	     str, code, class, msg );
     MPI_Abort( MPI_COMM_WORLD, code );
+    exit(code);
 }
 
 int main( int argc, char *argv[] )
diff --git a/teshsuite/smpi/mpich3-test/comm/ic1.c b/teshsuite/smpi/mpich3-test/comm/ic1.c
index 7ab4e6e962..9bb4a43b2b 100644
--- a/teshsuite/smpi/mpich3-test/comm/ic1.c
+++ b/teshsuite/smpi/mpich3-test/comm/ic1.c
@@ -24,6 +24,7 @@ int main( int argc, char *argv[] )
     if (size < 2) {
 	printf( "Size must be at least 2\n" );
 	MPI_Abort( MPI_COMM_WORLD, 0 );
+        exit(0);
     }
 
     MPI_Comm_rank( MPI_COMM_WORLD, &rank );
diff --git a/teshsuite/smpi/mpich3-test/comm/ic2.c b/teshsuite/smpi/mpich3-test/comm/ic2.c
index 8385648a29..adf5449fab 100644
--- a/teshsuite/smpi/mpich3-test/comm/ic2.c
+++ b/teshsuite/smpi/mpich3-test/comm/ic2.c
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
     if (size < 33) {
         printf("ERROR: this test requires at least 33 processes\n");
         MPI_Abort(MPI_COMM_WORLD, 1);
-        return 1;
+        exit(1);
     }
 
     /* group of c0
diff --git a/teshsuite/smpi/mpich3-test/comm/iccreate.c b/teshsuite/smpi/mpich3-test/comm/iccreate.c
index 4b3cedd92d..ef3d36334e 100644
--- a/teshsuite/smpi/mpich3-test/comm/iccreate.c
+++ b/teshsuite/smpi/mpich3-test/comm/iccreate.c
@@ -29,6 +29,7 @@ int main( int argc, char *argv[] )
     if (size < 4) {
 	printf( "This test requires at least 4 processes\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     MPI_Comm_rank( MPI_COMM_WORLD, &wrank );
 
diff --git a/teshsuite/smpi/mpich3-test/comm/icsplit.c b/teshsuite/smpi/mpich3-test/comm/icsplit.c
index 9ad2d51085..ab5aeecea6 100644
--- a/teshsuite/smpi/mpich3-test/comm/icsplit.c
+++ b/teshsuite/smpi/mpich3-test/comm/icsplit.c
@@ -28,6 +28,7 @@ int main( int argc, char *argv[] )
     if (size < 4) {
 	printf( "This test requires at least 4 processes\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     while (MTestGetIntercomm( &intercomm, &isLeft, 2 )) {
diff --git a/teshsuite/smpi/mpich3-test/comm/probe-intercomm.c b/teshsuite/smpi/mpich3-test/comm/probe-intercomm.c
index edd56e2cf8..03c9e109c1 100644
--- a/teshsuite/smpi/mpich3-test/comm/probe-intercomm.c
+++ b/teshsuite/smpi/mpich3-test/comm/probe-intercomm.c
@@ -32,6 +32,7 @@ int main( int argc, char *argv[] )
     if (size < 2) {
 	fprintf( stderr, "This test requires at least two processes." );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     while (MTestGetIntercomm( &intercomm, &isLeft, 2 )) {
diff --git a/teshsuite/smpi/mpich3-test/datatype/darray-cyclic.c b/teshsuite/smpi/mpich3-test/datatype/darray-cyclic.c
index 90eea4aec6..9de2c596d0 100644
--- a/teshsuite/smpi/mpich3-test/datatype/darray-cyclic.c
+++ b/teshsuite/smpi/mpich3-test/datatype/darray-cyclic.c
@@ -28,6 +28,7 @@ int main( int argc, char *argv[] )
     /* Test 1: Simple, 1-D cyclic decomposition */
     if (AllocateGrid( 1, 3*wsize, &srcArray, &destArray ) ) {
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     /* Simple cyclic with 1-dim global array */
@@ -44,6 +45,7 @@ int main( int argc, char *argv[] )
     if (PackUnpack( darraytype, srcArray, destArray, 3 )) {
 	fprintf( stderr, "Error in pack/unpack check\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     /* Now, check for correct data */
     for (i=0; i<3; i++) {
@@ -61,6 +63,7 @@ int main( int argc, char *argv[] )
     /* Test 2: Simple, 1-D cyclic decomposition, with block size=2 */
     if (AllocateGrid( 1, 4*wsize, &srcArray, &destArray ) ) {
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     /* Simple cyclic with 1-dim global array */
@@ -77,6 +80,7 @@ int main( int argc, char *argv[] )
     if (PackUnpack( darraytype, srcArray, destArray, 4 )) {
 	fprintf( stderr, "Error in pack/unpack check\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     loc = 0;
     /* for each cyclic element */
@@ -105,11 +109,13 @@ int main( int argc, char *argv[] )
     if (px * py != wsize) {
 	fprintf( stderr, "An even number of processes is required\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     /* Cyclic/Cyclic */
     if (AllocateGrid( 5*px, 7*py, &srcArray, &destArray )) {
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     /* Simple cyclic/cyclic. Note in C order, the [1] index varies most 
@@ -131,6 +137,7 @@ int main( int argc, char *argv[] )
     if (PackUnpack( darraytype, srcArray, destArray, 5*7 )) {
 	fprintf( stderr, "Error in pack/unpack check\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     loc = 0;
@@ -153,6 +160,7 @@ int main( int argc, char *argv[] )
     /* Cyclic(2)/Cyclic(3) */
     if (AllocateGrid( 6*px, 4*py, &srcArray, &destArray )) {
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     /* Block cyclic/cyclic. Note in C order, the [1] index varies most 
@@ -174,6 +182,7 @@ int main( int argc, char *argv[] )
     if (PackUnpack( darraytype, srcArray, destArray, 4*6 )) {
 	fprintf( stderr, "Error in pack/unpack check\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     loc = 0;
@@ -239,6 +248,7 @@ int PackUnpack( MPI_Datatype darraytype, const int srcArray[], int destArray[],
 	fprintf( stderr, "Unable to allocate pack array of size %d\n", 
 		 packsize );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     position = 0;
     MPI_Pack( (int*)srcArray, 1, darraytype, packArray, packsize, &position, 
diff --git a/teshsuite/smpi/mpich3-test/datatype/getpartelm.c b/teshsuite/smpi/mpich3-test/datatype/getpartelm.c
index 49ba725b85..9fe778f501 100644
--- a/teshsuite/smpi/mpich3-test/datatype/getpartelm.c
+++ b/teshsuite/smpi/mpich3-test/datatype/getpartelm.c
@@ -33,6 +33,7 @@ int main( int argc, char *argv[] )
 	errs++;
 	printf( "This test requires at least 2 processes\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     
     src  = 0;
diff --git a/teshsuite/smpi/mpich3-test/datatype/struct-ezhov.c b/teshsuite/smpi/mpich3-test/datatype/struct-ezhov.c
index 036eaf6417..3c44de2ca8 100644
--- a/teshsuite/smpi/mpich3-test/datatype/struct-ezhov.c
+++ b/teshsuite/smpi/mpich3-test/datatype/struct-ezhov.c
@@ -40,6 +40,7 @@ int main( int argc, char **argv )
     {
         fprintf(stderr, "Could not make struct type."), fflush(stderr); 
         MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     
     memset(s_buf, 0, EL_COUNT*SIZE);
diff --git a/teshsuite/smpi/mpich3-test/datatype/tfree.c b/teshsuite/smpi/mpich3-test/datatype/tfree.c
index d38fb7ff09..9f909f28a9 100644
--- a/teshsuite/smpi/mpich3-test/datatype/tfree.c
+++ b/teshsuite/smpi/mpich3-test/datatype/tfree.c
@@ -37,6 +37,7 @@ int main( int argc, char *argv[] )
     if (size < 2) {
 	fprintf( stderr, "This test requires at least two processes." );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     source  = 0;
diff --git a/teshsuite/smpi/mpich3-test/datatype/tresized.c b/teshsuite/smpi/mpich3-test/datatype/tresized.c
index 069fddcecd..ffaccad469 100644
--- a/teshsuite/smpi/mpich3-test/datatype/tresized.c
+++ b/teshsuite/smpi/mpich3-test/datatype/tresized.c
@@ -39,6 +39,7 @@ int main( int argc, char *argv[] )
 	buf = (int *)malloc( count * 3 * sizeof(int) );
 	if (!buf) {
 	    MPI_Abort( comm, 1 );
+            exit(1);
 	}
 	for (i=0; i<3*count; i++) buf[i] = -1;
 	if (rank == source) {
diff --git a/teshsuite/smpi/mpich3-test/datatype/tresized2.c b/teshsuite/smpi/mpich3-test/datatype/tresized2.c
index 064084bc40..2f5ec3ecbd 100644
--- a/teshsuite/smpi/mpich3-test/datatype/tresized2.c
+++ b/teshsuite/smpi/mpich3-test/datatype/tresized2.c
@@ -43,6 +43,7 @@ int main( int argc, char *argv[] )
 	buf = (int *)malloc( count * 3 * sizeof(int) );
 	if (!buf) {
 	    MPI_Abort( comm, 1 );
+            exit(1);
 	}
 	for (i=0; i<3*count; i++) buf[i] = -1;
 	if (rank == source) {
diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/indtype.f90 b/teshsuite/smpi/mpich3-test/f90/datatype/indtype.f90
index 79829e7a2f..5367f998cc 100644
--- a/teshsuite/smpi/mpich3-test/f90/datatype/indtype.f90
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/indtype.f90
@@ -24,6 +24,7 @@
       if (size .lt. 2) then
          print *, "Must have at least 2 processes"
          call MPI_Abort( 1, MPI_COMM_WORLD, ierr )
+         stop
       endif
 
       errs = 0
diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/structf.f90 b/teshsuite/smpi/mpich3-test/f90/datatype/structf.f90
index abc17daf16..71e9735422 100644
--- a/teshsuite/smpi/mpich3-test/f90/datatype/structf.f90
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/structf.f90
@@ -45,6 +45,7 @@
       if (size .lt. 2) then
          print *, "Must have at least 2 processes"
          call MPI_Abort( 1, MPI_COMM_WORLD, ierr )
+         stop
       endif
 
       comm = MPI_COMM_WORLD
diff --git a/teshsuite/smpi/mpich3-test/group/gtranks.c b/teshsuite/smpi/mpich3-test/group/gtranks.c
index e5f032ff56..3e753a4b0e 100644
--- a/teshsuite/smpi/mpich3-test/group/gtranks.c
+++ b/teshsuite/smpi/mpich3-test/group/gtranks.c
@@ -33,10 +33,12 @@ int main( int argc, char *argv[] )
 	 "This test requires a comm world with no more than %d processes\n", 
 		 MAX_WORLD_SIZE );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     if (size < 4) {
 	fprintf( stderr, "This test requiers at least 4 processes\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     MPI_Comm_group( comm, &gworld );
diff --git a/teshsuite/smpi/mpich3-test/group/gtranksperf.c b/teshsuite/smpi/mpich3-test/group/gtranksperf.c
index 98b79d22f1..9900aa3dba 100644
--- a/teshsuite/smpi/mpich3-test/group/gtranksperf.c
+++ b/teshsuite/smpi/mpich3-test/group/gtranksperf.c
@@ -45,6 +45,7 @@ int main( int argc, char *argv[] )
     if (!ranks || !ranksout) {
         fprintf(stderr, "out of memory\n");
         MPI_Abort(MPI_COMM_WORLD, 1);
+        exit(1);
     }
 
     /* generate a comm with the rank order reversed */
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/bottom.c b/teshsuite/smpi/mpich3-test/pt2pt/bottom.c
index 3c085fd2c2..797716b9e2 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/bottom.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/bottom.c
@@ -39,6 +39,7 @@ int main( int argc, char *argv[] )
 	errs++;
 	fprintf( stderr, "This test requires at least two processes\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     source = 0;
     dest = 1;
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/bsendfrag.c b/teshsuite/smpi/mpich3-test/pt2pt/bsendfrag.c
index 8f22959218..03263696ff 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/bsendfrag.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/bsendfrag.c
@@ -43,6 +43,7 @@ int main( int argc, char *argv[] )
 	errs++;
 	fprintf( stderr, "At least 2 processes required\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     src  = 0;
@@ -57,6 +58,7 @@ int main( int argc, char *argv[] )
 	    fprintf( stderr, "Could not allocate buffer of %d bytes\n", 
 		     bufsize );
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
 	MPI_Buffer_attach( buf, bufsize );
 
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/bsendpending.c b/teshsuite/smpi/mpich3-test/pt2pt/bsendpending.c
index cc7cc5acd1..70aa336360 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/bsendpending.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/bsendpending.c
@@ -53,6 +53,7 @@ int main( int argc, char *argv[] )
 		fprintf( stderr, "Unable to allocate a buffer of %d bytes\n",
 			 bufsize );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 	    
 	    MPI_Buffer_attach( buf, bufsize );
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/cancelrecv.c b/teshsuite/smpi/mpich3-test/pt2pt/cancelrecv.c
index 274474858a..850364a01b 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/cancelrecv.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/cancelrecv.c
@@ -24,6 +24,7 @@ int main( int argc, char *argv[] )
     if (size < 2) {
 	fprintf( stderr, "Must run with at least 2 processes\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     MPI_Comm_rank( MPI_COMM_WORLD, &rank );
 
@@ -39,6 +40,7 @@ int main( int argc, char *argv[] )
 	fprintf( stderr, "Unable to allocate buffers of size %d\n", 
 		 n0 * (int)sizeof(int) );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
     memset( buf0, -1, n0 * sizeof(int) );
     memset( buf1, -1, n0 * sizeof(int) );
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/eagerdt.c b/teshsuite/smpi/mpich3-test/pt2pt/eagerdt.c
index 4adc26c124..7855b75e4f 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/eagerdt.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/eagerdt.c
@@ -51,6 +51,7 @@ int main( int argc, char *argv[] )
 	    fprintf( stderr, "Unable to allocate buffer %d of size %ld\n", 
 		    	i, (long)extent );
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
     }
     buf = (int *)malloc( 10 * 30 * sizeof(int) );
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/large_message.c b/teshsuite/smpi/mpich3-test/pt2pt/large_message.c
index b8a6d0924c..42d60b7bb6 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/large_message.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/large_message.c
@@ -34,6 +34,7 @@ int main(int argc, char *argv[])
   if (size != 3) {
     fprintf(stderr,"[%d] usage: mpiexec -n 3 %s\n",rank,argv[0]);
     MPI_Abort(MPI_COMM_WORLD,1);
+    exit(1);
   }
 
   cols = malloc(cnt*sizeof(long long));
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/mprobe.c b/teshsuite/smpi/mpich3-test/pt2pt/mprobe.c
index c48d871d40..2e97536c96 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/mprobe.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/mprobe.c
@@ -49,6 +49,7 @@ int main(int argc, char **argv)
     if (size < 2) {
         printf("this test requires at least 2 processes\n");
         MPI_Abort(MPI_COMM_WORLD, 1);
+        exit(1);
     }
 
     /* all processes besides ranks 0 & 1 aren't used by this test */
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/pscancel.c b/teshsuite/smpi/mpich3-test/pt2pt/pscancel.c
index e32e5f1081..08b6b2c11f 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/pscancel.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/pscancel.c
@@ -43,6 +43,7 @@ int main( int argc, char *argv[] )
 	    if (!buf) {
 		fprintf( stderr, "Unable to allocate %d bytes\n", n );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 	    MPI_Send_init( buf, n, MPI_CHAR, dest, cs+n+1, comm, &req );
 	    MPI_Start( &req );
@@ -80,6 +81,7 @@ int main( int argc, char *argv[] )
 		{
 		    fprintf( stderr, "Unable to allocate %d bytes\n", nn);
 		    MPI_Abort( MPI_COMM_WORLD, 1 );
+                    exit(1);
 		}
 		MPI_Recv( btemp, nn, MPI_CHAR, 0, tag, comm, &status );
 		free(btemp);
@@ -96,12 +98,14 @@ int main( int argc, char *argv[] )
 	    if (!buf) {
 		fprintf( stderr, "Unable to allocate %d bytes\n", n );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 	    bsendbufsize = n + MPI_BSEND_OVERHEAD;
 	    bsendbuf = (char *)malloc( bsendbufsize );
 	    if (!bsendbuf) {
 		fprintf( stderr, "Unable to allocate %d bytes for bsend\n", n );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 	    MPI_Buffer_attach( bsendbuf, bsendbufsize );
 	    MPI_Bsend_init( buf, n, MPI_CHAR, dest, cs+n+2, comm, &req );
@@ -142,6 +146,7 @@ int main( int argc, char *argv[] )
 		{
 		    fprintf( stderr, "Unable to allocate %d bytes\n", nn);
 		    MPI_Abort( MPI_COMM_WORLD, 1 );
+                    exit(1);
 		}
 		MPI_Recv( btemp, nn, MPI_CHAR, 0, tag, comm, &status );
 		free(btemp);
@@ -162,6 +167,7 @@ int main( int argc, char *argv[] )
 	    if (!buf) {
 		fprintf( stderr, "Unable to allocate %d bytes\n", n );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 	    MPI_Rsend_init( buf, n, MPI_CHAR, dest, cs+n+3, comm, &req );
 	    MPI_Start( &req );
@@ -208,6 +214,7 @@ int main( int argc, char *argv[] )
 		{
 		    fprintf( stderr, "Unable to allocate %d bytes\n", n);
 		    MPI_Abort( MPI_COMM_WORLD, 1 );
+                    exit(1);
 		}
 		MPI_Recv( btemp, n, MPI_CHAR, 0, tag, comm, &status );
 		free(btemp);
@@ -222,6 +229,7 @@ int main( int argc, char *argv[] )
 	    if (!buf) {
 		fprintf( stderr, "Unable to allocate %d bytes\n", n );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 	    MPI_Ssend_init( buf, n, MPI_CHAR, dest, cs+n+4, comm, &req );
 	    MPI_Start( &req );
@@ -259,6 +267,7 @@ int main( int argc, char *argv[] )
 		{
 		    fprintf( stderr, "Unable to allocate %d bytes\n", nn);
 		    MPI_Abort( MPI_COMM_WORLD, 1 );
+                    exit(1);
 		}
 		MPI_Recv( btemp, nn, MPI_CHAR, 0, tag, comm, &status );
 		free(btemp);
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/rqfreeb.c b/teshsuite/smpi/mpich3-test/pt2pt/rqfreeb.c
index 1a6eab1216..2d752ca645 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/rqfreeb.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/rqfreeb.c
@@ -27,6 +27,7 @@ int main( int argc, char *argv[] )
 	if (dest > r) r = dest;
 	fprintf( stderr, "This program requires %d processes\n", r-1 );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     if (rank == src) {
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/scancel.c b/teshsuite/smpi/mpich3-test/pt2pt/scancel.c
index 7c8cf65318..7623be60e1 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/scancel.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/scancel.c
@@ -44,6 +44,7 @@ int main( int argc, char *argv[] )
 	    if (!buf) {
 		fprintf( stderr, "Unable to allocate %d bytes\n", n );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 	    MTestPrintfMsg( 1, "(%d) About to create isend and cancel\n",cs );
 	    MPI_Isend( buf, n, MPI_CHAR, dest, cs+n+1, comm, &req );
@@ -81,6 +82,7 @@ int main( int argc, char *argv[] )
 		{
 		    fprintf( stderr, "Unable to allocate %d bytes\n", nn );
 		    MPI_Abort( MPI_COMM_WORLD, 1 );
+                    exit(1);
 		}
 		MPI_Recv( btemp, nn, MPI_CHAR, 0, tag, comm, &status );
 		free(btemp);
@@ -97,12 +99,14 @@ int main( int argc, char *argv[] )
 	    if (!buf) {
 		fprintf( stderr, "Unable to allocate %d bytes\n", n );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 	    bsendbufsize = n + MPI_BSEND_OVERHEAD;
 	    bsendbuf = (char *)malloc( bsendbufsize );
 	    if (!bsendbuf) {
 		fprintf( stderr, "Unable to allocate %d bytes for bsend\n", n );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 	    MPI_Buffer_attach( bsendbuf, bsendbufsize );
 	    MTestPrintfMsg( 1, "About to create and cancel ibsend\n" );
@@ -142,6 +146,7 @@ int main( int argc, char *argv[] )
 		{
 		    fprintf( stderr, "Unable to allocate %d bytes\n", nn);
 		    MPI_Abort( MPI_COMM_WORLD, 1 );
+                    exit(1);
 		}
 		MPI_Recv( btemp, nn, MPI_CHAR, 0, tag, comm, &status );
 		free(btemp);
@@ -162,6 +167,7 @@ int main( int argc, char *argv[] )
 	    if (!buf) {
 		fprintf( stderr, "Unable to allocate %d bytes\n", n );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 	    MTestPrintfMsg( 1, "About to create and cancel irsend\n" );
 	    MPI_Irsend( buf, n, MPI_CHAR, dest, cs+n+3, comm, &req );
@@ -207,6 +213,7 @@ int main( int argc, char *argv[] )
 		{
 		    fprintf( stderr, "Unable to allocate %d bytes\n", n);
 		    MPI_Abort( MPI_COMM_WORLD, 1 );
+                    exit(1);
 		}
 		MPI_Recv( btemp, n, MPI_CHAR, 0, tag, comm, &status );
 		free(btemp);
@@ -221,6 +228,7 @@ int main( int argc, char *argv[] )
 	    if (!buf) {
 		fprintf( stderr, "Unable to allocate %d bytes\n", n );
 		MPI_Abort( MPI_COMM_WORLD, 1 );
+                exit(1);
 	    }
 	    MTestPrintfMsg( 1, "About to create and cancel issend\n" );
 	    MPI_Issend( buf, n, MPI_CHAR, dest, cs+n+4, comm, &req );
@@ -257,6 +265,7 @@ int main( int argc, char *argv[] )
 		{
 		    fprintf( stderr, "Unable to allocate %d bytes\n", nn);
 		    MPI_Abort( MPI_COMM_WORLD, 1 );
+                    exit(1);
 		}
 		MPI_Recv( btemp, nn, MPI_CHAR, 0, tag, comm, &status );
 		free(btemp);
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/scancel2.c b/teshsuite/smpi/mpich3-test/pt2pt/scancel2.c
index b027f0b6d8..8da02570da 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/scancel2.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/scancel2.c
@@ -40,6 +40,7 @@ int main( int argc, char *argv[] )
 	if (!buf) {
 	    fprintf( stderr, "Unable to allocate %d bytes\n", n );
 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+            exit(1);
 	}
 
 	if (rank == source) {
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/sendall.c b/teshsuite/smpi/mpich3-test/pt2pt/sendall.c
index eba48e60a8..2f87e47eb0 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/sendall.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/sendall.c
@@ -40,6 +40,7 @@ int main ( int argc, char *argv[] )
     fprintf( stderr, "This program requires a comm_world no larger than %d",
 	     MAXPES );
     MPI_Abort( MPI_COMM_WORLD, 1 );
+    exit(1);
   }
 
   for (size = 1; size  <= MYBUFSIZE ; size += size) {
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/sendrecv3.c b/teshsuite/smpi/mpich3-test/pt2pt/sendrecv3.c
index e0c21a7ad9..19ced11b46 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/sendrecv3.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/sendrecv3.c
@@ -35,6 +35,7 @@ int main( int argc, char *argv[] )
     if (size < 2) {
 	printf( "This test requires at least 2 processes\n" );
 	MPI_Abort( MPI_COMM_WORLD, 1 );
+        exit(1);
     }
 
     for (testnum=0; msgsizes[testnum] > 0; testnum++) {
@@ -50,6 +51,7 @@ int main( int argc, char *argv[] )
 		    fprintf( stderr, "Unable to allocate %d bytes\n", 
 			     msgSize );
 		    MPI_Abort( MPI_COMM_WORLD, 1 );
+                    exit(1);
 		}
 	    }
 	    partner = (rank + 1) % size;
diff --git a/teshsuite/smpi/mpich3-test/util/mtest.c b/teshsuite/smpi/mpich3-test/util/mtest.c
index 6f40201421..0fd3032f98 100644
--- a/teshsuite/smpi/mpich3-test/util/mtest.c
+++ b/teshsuite/smpi/mpich3-test/util/mtest.c
@@ -1534,6 +1534,7 @@ void MTestError( const char *msg )
     fprintf( stderr, "%s\n", msg );
     fflush( stderr );
     MPI_Abort( MPI_COMM_WORLD, 1 );
+    exit(1);
 }
 /* ------------------------------------------------------------------------ */
 static void MTestResourceSummary( FILE *fp )
-- 
2.20.1