X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e9c0448c6566825b170b98ecff716b098bda10e..597332fc124e7b046dfff9ec21658a85d367f372:/teshsuite/smpi/mpich3-test/coll/coll6.c

diff --git a/teshsuite/smpi/mpich3-test/coll/coll6.c b/teshsuite/smpi/mpich3-test/coll/coll6.c
index 6e8ea360f5..e0973f9a1b 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);
 
@@ -53,9 +54,14 @@ int main( int argc, char **argv )
 	  table[i][j] = rank + 10;
       
       /* Everybody gets the gathered data */
-      MPI_Allgatherv(&table[begin_row][0], send_count, MPI_INT, 
-		     &table[0][0], recv_counts, displs, 
-                     MPI_INT, test_comm);
+      if ((char *) &table[begin_row][0] != (char *) table + displs[rank]*sizeof(int))
+          MPI_Allgatherv(&table[begin_row][0], send_count, MPI_INT,
+                         &table[0][0], recv_counts, displs,
+                         MPI_INT, test_comm);
+      else
+          MPI_Allgatherv(MPI_IN_PLACE, send_count, MPI_INT,
+                         &table[0][0], recv_counts, displs,
+                         MPI_INT, test_comm);
 
       /* Everybody should have the same table now.