Merge branch 'v3_10_x'

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

diff --git a/teshsuite/smpi/mpich3-test/coll/nonblocking3.c b/teshsuite/smpi/mpich3-test/coll/nonblocking3.c
index e072def46893c6a2f4431fcaba5519d1f1a75562..2afbc575d09ccc3b5e55bd46dd9c1af6608e213b 100644 (file)
--- a/teshsuite/smpi/mpich3-test/coll/nonblocking3.c
+++ b/teshsuite/smpi/mpich3-test/coll/nonblocking3.c
@@ -405,6 +405,7 @@ static void start_random_nonblocking(MPI_Comm comm, unsigned int rndnum, MPI_Req
         default:
             fprintf(stderr, "unexpected value for l->case_num=%d)\n", (l->case_num));
             MPI_Abort(comm, 1);
+            exit(1);
             break;
     }
 }
@@ -749,18 +750,18 @@ static void complete_something_somehow(unsigned int rndnum, int numreqs, MPI_Req
 
 int main(int argc, char **argv)
 {
-    int i, num_posted, num_completed;
     int wrank, wsize;
+#if defined(TEST_NBC_ROUTINES)
+    int i, num_posted, num_completed;
     unsigned int seed = 0x10bc;
     unsigned int post_seq, complete_seq;
-#if defined(TEST_NBC_ROUTINES)
     struct laundry larr[WINDOW];
-#endif
     MPI_Request reqs[WINDOW];
     int outcount;
     int indices[WINDOW];
     MPI_Comm comms[NUM_COMMS];
     MPI_Comm comm;
+#endif
 
     MPI_Init(&argc, &argv);
     MPI_Comm_rank(MPI_COMM_WORLD, &wrank);