X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2a4fb0f73d26c846e4c32c563d51a0e2d449da3d..8e4a5c074a1b17227be6cfadbad2477b66666aee:/teshsuite/smpi/mpich3-test/datatype/contents.c

diff --git a/teshsuite/smpi/mpich3-test/datatype/contents.c b/teshsuite/smpi/mpich3-test/datatype/contents.c
index 53d2a9013e..4ae792a421 100644
--- a/teshsuite/smpi/mpich3-test/datatype/contents.c
+++ b/teshsuite/smpi/mpich3-test/datatype/contents.c
@@ -5,7 +5,7 @@
  */
 #include "mpi.h"
 #include "mpitestconf.h"
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <stdio.h>
@@ -97,7 +97,7 @@ int builtin_float_test(void)
 
     err = MPI_Type_get_envelope(MPI_FLOAT, &nints, &nadds, &ntypes, &combiner);
 
-    if (combiner != MPI_COMBINER_NAMED)
+    if (combiner != MPI_COMBINER_NAMED || err != MPI_SUCCESS)
         errs++;
     if (verbose && combiner != MPI_COMBINER_NAMED)
         fprintf(stderr, "combiner = %s; should be named\n", combiner_to_string(combiner));
@@ -307,7 +307,7 @@ int optimizable_vector_of_basics_test(void)
     /* decode */
     err = MPI_Type_get_envelope(parent_type, &nints, &nadds, &ntypes, &combiner);
 
-    if (nints != 3)
+    if (nints != 3 || err != MPI_SUCCESS)
         errs++;
     if (nadds != 0)
         errs++;
@@ -389,7 +389,7 @@ int indexed_of_basics_test(void)
     /* decode */
     err = MPI_Type_get_envelope(parent_type, &nints, &nadds, &ntypes, &combiner);
 
-    if (nints != 7)
+    if (nints != 7 || err != MPI_SUCCESS)
         errs++;
     if (nadds != 0)
         errs++;