X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d144105ea9f597667575c74c2d8b7252ebddb84e..b195400e3382f070aa49293a0ab7d9441889f5e4:/teshsuite/smpi/mpich3-test/util/mtest.c

diff --git a/teshsuite/smpi/mpich3-test/util/mtest.c b/teshsuite/smpi/mpich3-test/util/mtest.c
index b00579bf78..b68178ee91 100644
--- a/teshsuite/smpi/mpich3-test/util/mtest.c
+++ b/teshsuite/smpi/mpich3-test/util/mtest.c
@@ -340,7 +340,7 @@ int MTestGetIntracommGeneral(MPI_Comm * comm, int min_size, int allowSmaller)
             break;
         case 5:
             {
-#if MTEST_HAVE_MIN_MPI_VERSION(3,0)
+#if MTEST_HAVE_MIN_MPI_VERSION(4,0)
                 /* Dup of the world using MPI_Intercomm_merge */
                 int rleader, isLeft;
                 MPI_Comm local_comm, inter_comm;
@@ -575,7 +575,7 @@ int MTestGetIntercomm(MPI_Comm * comm, int *isLeftGroup, int min_size)
                     rleader = 0;
                 }
                 else {
-                    /* Remote leader is signficant only for the processes
+                    /* Remote leader is significant only for the processes
                      * designated local leaders */
                     rleader = -1;
                 }
@@ -607,7 +607,7 @@ int MTestGetIntercomm(MPI_Comm * comm, int *isLeftGroup, int min_size)
                     rleader = 0;
                 }
                 else {
-                    /* Remote leader is signficant only for the processes
+                    /* Remote leader is significant only for the processes
                      * designated local leaders */
                     rleader = -1;
                 }
@@ -640,7 +640,7 @@ int MTestGetIntercomm(MPI_Comm * comm, int *isLeftGroup, int min_size)
                     rleader = 0;
                 }
                 else {
-                    /* Remote leader is signficant only for the processes
+                    /* Remote leader is significant only for the processes
                      * designated local leaders */
                     rleader = -1;
                 }
@@ -673,7 +673,7 @@ int MTestGetIntercomm(MPI_Comm * comm, int *isLeftGroup, int min_size)
                     rleader = 0;
                 }
                 else {
-                    /* Remote leader is signficant only for the processes
+                    /* Remote leader is significant only for the processes
                      * designated local leaders */
                     rleader = -1;
                 }
@@ -716,7 +716,7 @@ int MTestGetIntercomm(MPI_Comm * comm, int *isLeftGroup, int min_size)
                     rleader = 0;
                 }
                 else {
-                    /* Remote leader is signficant only for the processes
+                    /* Remote leader is significant only for the processes
                      * designated local leaders */
                     rleader = -1;
                 }
@@ -769,7 +769,7 @@ int MTestGetIntercomm(MPI_Comm * comm, int *isLeftGroup, int min_size)
                     rleader = 1;
                 }
                 else {
-                    /* Remote leader is signficant only for the processes
+                    /* Remote leader is significant only for the processes
                      * designated local leaders */
                     rleader = -1;
                 }
@@ -813,7 +813,7 @@ int MTestGetIntercomm(MPI_Comm * comm, int *isLeftGroup, int min_size)
                     rleader = 0;
                 }
                 else {
-                    /* Remote leader is signficant only for the processes
+                    /* Remote leader is significant only for the processes
                      * designated local leaders */
                     rleader = -1;
                 }
@@ -1033,9 +1033,9 @@ int MTestGetComm(MPI_Comm * comm, int min_size)
 
     if (!getinter) {
         idx = MTestGetIntracomm(comm, min_size);
-        if (idx == 0) {
-            getinter = 1;
-        }
+/*        if (idx == 0) {*/
+/*            getinter = 1;*/
+/*        }*/
     }
     if (getinter) {
         int isLeft;
@@ -1091,11 +1091,10 @@ void MTestPrintErrorMsg(const char msg[], int errcode)
 void MTestPrintfMsg(int level, const char format[], ...)
 {
     va_list list;
-    int n;
 
     if (verbose && level <= verbose) {
         va_start(list, format);
-        n = vprintf(format, list);
+        vprintf(format, list);
         va_end(list);
         fflush(stdout);
     }
@@ -1112,7 +1111,7 @@ void MTestError(const char *msg)
 /* ------------------------------------------------------------------------ */
 static void MTestResourceSummary(FILE * fp)
 {
-#ifdef HAVE_GETRUSAGE
+#if defined(HAVE_GETRUSAGE) && !defined(__HAIKU__)
     struct rusage ru;
     static int pfThreshold = -2;
     int doOutput = 1;