X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b73466ada27682d1729f394549479da83ef4a99..550e68e2d3bb08b56b4c900ba701e07f38882b19:/teshsuite/smpi/mpich3-test/coll/nonblocking.c

diff --git a/teshsuite/smpi/mpich3-test/coll/nonblocking.c b/teshsuite/smpi/mpich3-test/coll/nonblocking.c
index 8f49a99ad7..d520ba11ec 100644
--- a/teshsuite/smpi/mpich3-test/coll/nonblocking.c
+++ b/teshsuite/smpi/mpich3-test/coll/nonblocking.c
@@ -12,13 +12,6 @@
 #include "mpi.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "mpitest.h"
-/* USE_STRICT_MPI may be defined in mpitestconf.h */
-#include "mpitestconf.h"
-
-#if !defined(USE_STRICT_MPI) && defined(MPICH)
-#define TEST_NBC_ROUTINES 1
-#endif
 
 #define NUM_INTS (2)
 
@@ -27,12 +20,14 @@
         if (!(cond_)) {                                                   \
             fprintf(stderr, "assertion (%s) failed, aborting\n", #cond_); \
             MPI_Abort(MPI_COMM_WORLD, 1);                                 \
+            exit(1);                                                      \
         }                                                                 \
     } while (0)
 
 int main(int argc, char **argv)
 {
     int errs = 0;
+    int i;
     int rank, size;
     int *sbuf = NULL;
     int *rbuf = NULL;
@@ -40,12 +35,9 @@ int main(int argc, char **argv)
     int *rcounts = NULL;
     int *sdispls = NULL;
     int *rdispls = NULL;
-    MPI_Comm comm;
-#if defined(TEST_NBC_ROUTINES)
-    int i;
     int *types = NULL;
+    MPI_Comm comm;
     MPI_Request req;
-#endif
 
     /* intentionally not using MTest_Init/MTest_Finalize in order to make it
      * easy to take this test and use it as an NBC sanity test outside of the
@@ -57,7 +49,6 @@ int main(int argc, char **argv)
     MPI_Comm_size(comm, &size);
     MPI_Comm_rank(comm, &rank);
 
-#if defined(TEST_NBC_ROUTINES)
     /* enough space for every process to contribute at least NUM_INTS ints to any
      * collective operation */
     sbuf = malloc(NUM_INTS*size*sizeof(int));
@@ -138,8 +129,6 @@ int main(int argc, char **argv)
     MPI_Iexscan(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req);
     MPI_Wait(&req, MPI_STATUS_IGNORE);
 
-#endif
-
     if (sbuf) free(sbuf);
     if (rbuf) free(rbuf);
     if (scounts) free(scounts);