[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1rc2-76-g1c70aae

[mysql vizuser]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  1c70aae3f0ee9cafb88e5e640f04f60fe257dfce (commit)
      from  e49ee8c03d72671d41616a07f818023e69dae365 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/1c70aae3f0ee9cafb88e5e640f04f60fe257dfce

commit 1c70aae3f0ee9cafb88e5e640f04f60fe257dfce
Author: Bob Cernohous <bobc at us.ibm.com>
Date:   Tue Sep 10 12:16:47 2013 -0500

    Test updates for ad_bglockless.
    
    Add some minor error checking to fail more obviously.
    
    Add MPITEST_FILE_ERRORS_THROW_EXCEPTIONS to turn on file i/o exceptions for
    cxx tests.
    
    (ibm) Issue 8847
    (ibm) ec58bb29b7f8051973303364c6f469bb291773e3
    
    Signed-off-by: Michael Blocksome <blocksom at us.ibm.com>
    Signed-off-by: Rob Latham <robl at mcs.anl.gov>

diff --git a/test/mpi/cxx/util/mtest.cxx b/test/mpi/cxx/util/mtest.cxx
index ee5479f..a4689b4 100644
--- a/test/mpi/cxx/util/mtest.cxx
+++ b/test/mpi/cxx/util/mtest.cxx
@@ -76,6 +76,8 @@ void MTest_Init( void )
 	provided = MPI::Init_thread( threadLevel );
     }
 
+    MPI::FILE_NULL.Set_errhandler(MPI::ERRORS_THROW_EXCEPTIONS);
+
     /* Check for debugging control */
     if (getenv( "MPITEST_DEBUG" )) {
 	dbgflag = 1;
diff --git a/test/mpi/f77/io/shpositionf.f b/test/mpi/f77/io/shpositionf.f
index d403537..65a474a 100644
--- a/test/mpi/f77/io/shpositionf.f
+++ b/test/mpi/f77/io/shpositionf.f
@@ -40,6 +40,12 @@ C write
            if (i .eq. r + 1) then
               call mpi_file_write_shared( fh, i, 1, MPI_INTEGER, 
      &            MPI_STATUS_IGNORE, ierr )
+           if (ierr .ne. MPI_SUCCESS) then
+              errs = errs + 1
+              if (errs .le. 10) then
+                 call MTestPrintError( ierr )
+              endif
+           endif
            endif
            call mpi_barrier( comm, ierr )
            call mpi_file_get_position_shared( fh, offset, ierr )
diff --git a/test/mpi/io/rdwrord.c b/test/mpi/io/rdwrord.c
index 47f744e..245b266 100644
--- a/test/mpi/io/rdwrord.c
+++ b/test/mpi/io/rdwrord.c
@@ -16,7 +16,7 @@ static char MTEST_Descrip[] = "Test reading and writing ordered output";
 int main( int argc, char *argv[] )
 {
     int errs = 0;
-    int size, rank, i, *buf;
+    int size, rank, i, *buf, rc;
     MPI_File fh;
     MPI_Comm comm;
     MPI_Status status;
@@ -32,8 +32,11 @@ int main( int argc, char *argv[] )
     MPI_Comm_rank( comm, &rank );
     buf = (int *)malloc( size * sizeof(int) );
     buf[0] = rank;
-    MPI_File_write_ordered( fh, buf, 1, MPI_INT, &status );
-
+    rc = MPI_File_write_ordered( fh, buf, 1, MPI_INT, &status );
+    if (rc) {
+	MTestPrintErrorMsg( "File_write_ordered", rc );
+	errs++;
+    }
     /* make sure all writes finish before we seek/read */
     MPI_Barrier(comm);
     

-----------------------------------------------------------------------

Summary of changes:
 test/mpi/cxx/util/mtest.cxx   |    2 ++
 test/mpi/f77/io/shpositionf.f |    6 ++++++
 test/mpi/io/rdwrord.c         |    9 ++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository