[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.1-13-g54e9830

[Service Account]

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  54e9830bf52ae846e370906c9631c5d52f605dc6 (commit)
      from  d505ece8ea259a6334f35dd4023a762b9d73d0ba (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/54e9830bf52ae846e370906c9631c5d52f605dc6

commit 54e9830bf52ae846e370906c9631c5d52f605dc6
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Tue Jun 17 07:10:29 2014 -0500

    fix assert in win_shared_noncontig tests
    
    A correct MPI-3 implementation may allocate more memory than requested
    when calling MPI_Win_allocate_shared with alloc_shared_noncontig
    specified (MPI-3, p409, l13-16). The testsuite incorrectly asserts
    that the size of an allocated segment is exactly as requested. This
    is fixed by changing the comparison operators from == to >=.
    
    Discussion of this test error originated on OpenMPI ticket #4721.
    
    Signed-off-by: Junchao Zhang <jczhang at mcs.anl.gov>

diff --git a/test/mpi/rma/win_shared_noncontig.c b/test/mpi/rma/win_shared_noncontig.c
index a6ab73b..22e37e1 100644
--- a/test/mpi/rma/win_shared_noncontig.c
+++ b/test/mpi/rma/win_shared_noncontig.c
@@ -59,7 +59,7 @@ int main(int argc, char **argv) {
         MPI_Aint  size;
 
         MPI_Win_shared_query(shm_win, i, &size, &disp_unit, &base);
-        assert(size == ELEM_PER_PROC * sizeof(int));
+        assert(size >= ELEM_PER_PROC * sizeof(int));
 
         for (j = 0; j < ELEM_PER_PROC; j++) {
             if ( base[j] != j ) {
diff --git a/test/mpi/rma/win_shared_noncontig_put.c b/test/mpi/rma/win_shared_noncontig_put.c
index 60409a8..0e68d2d 100644
--- a/test/mpi/rma/win_shared_noncontig_put.c
+++ b/test/mpi/rma/win_shared_noncontig_put.c
@@ -63,7 +63,7 @@ int main(int argc, char **argv) {
         MPI_Win_shared_query(shm_win, i, &size, &disp_unit, &base);
 
         if (i % 2 == 0) {
-            assert(size == ELEM_PER_PROC * sizeof(int));
+            assert(size >= ELEM_PER_PROC * sizeof(int));
 
             for (j = 0; j < ELEM_PER_PROC; j++) {
                 if ( base[j] != j ) {

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

Summary of changes:
 test/mpi/rma/win_shared_noncontig.c     |    2 +-
 test/mpi/rma/win_shared_noncontig_put.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
MPICH primary repository