update collectives teshsuite from mpich git (only minor changes)

[simgrid.git] / teshsuite / smpi / mpich3-test / coll / ibarrier.c

diff --git a/teshsuite/smpi/mpich3-test/coll/ibarrier.c b/teshsuite/smpi/mpich3-test/coll/ibarrier.c
index 44d6703..affde1f 100644 (file)
--- a/teshsuite/smpi/mpich3-test/coll/ibarrier.c
+++ b/teshsuite/smpi/mpich3-test/coll/ibarrier.c
@@ -11,28 +11,20 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#if !defined(USE_STRICT_MPI) && defined(MPICH)
-#define TEST_NBC_ROUTINES 1
-#endif
-
 int main(int argc, char *argv[])
 {
-#if defined(TEST_NBC_ROUTINES)
     MPI_Request barrier;
-    int i,done;
-#endif
-    int rank;
+    int rank,i,done;
 
     MPI_Init(&argc,&argv);
     MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-#if defined(TEST_NBC_ROUTINES)
     MPI_Ibarrier(MPI_COMM_WORLD,&barrier);
     for (i=0,done=0; !done; i++) {
         usleep(1000);
         /*printf("[%d] MPI_Test: %d\n",rank,i);*/
         MPI_Test(&barrier,&done,MPI_STATUS_IGNORE);
     }
-#endif
+
     if (rank == 0)
         printf(" No Errors\n");