X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e694957c5830a9f1407392fa7f76796274aa4d18..4e542e84cc04fe3099015852fb5990fc4151d54b:/teshsuite/smpi/mpich3-test/coll/icbarrier.c

diff --git a/teshsuite/smpi/mpich3-test/coll/icbarrier.c b/teshsuite/smpi/mpich3-test/coll/icbarrier.c
index b2d022a104..43e48c03b0 100644
--- a/teshsuite/smpi/mpich3-test/coll/icbarrier.c
+++ b/teshsuite/smpi/mpich3-test/coll/icbarrier.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "mpitest.h"
+#include "mpicolltest.h"
 
 /*
 static char MTEST_Descrip[] = "Simple intercomm barrier test";
@@ -15,45 +16,45 @@ static char MTEST_Descrip[] = "Simple intercomm barrier test";
 
 /* This only checks that the Barrier operation accepts intercommunicators.
    It does not check for the semantics of a intercomm barrier (all processes
-   in the local group can exit when (but not before) all processes in the 
+   in the local group can exit when (but not before) all processes in the
    remote group enter the barrier */
-int main( int argc, char *argv[] )
+int main(int argc, char *argv[])
 {
     int errs = 0, err;
     int leftGroup;
     MPI_Comm comm;
-    /* MPI_Datatype datatype; */
+    MPI_Datatype datatype;
 
-    MTest_Init( &argc, &argv );
+    MTest_Init(&argc, &argv);
 
-    /* datatype = MPI_INT; */
+    datatype = MPI_INT;
     /* Get an intercommunicator */
-    while (MTestGetIntercomm( &comm, &leftGroup, 4 )) {
+    while (MTestGetIntercomm(&comm, &leftGroup, 4)) {
         if (comm == MPI_COMM_NULL)
             continue;
 
-	/* To improve reporting of problems about operations, we
-	   change the error handler to errors return */
-	MPI_Comm_set_errhandler( comm, MPI_ERRORS_RETURN );
-	if (leftGroup) {
-	    err = MPI_Barrier( comm );
-	    if (err) {
-		errs++;
-		MTestPrintError( err );
-	    }
-	}
-	else {
-	    /* In the right group */
-	    err = MPI_Barrier( comm );
-	    if (err) {
-		errs++;
-		MTestPrintError( err );
-	    }
-	}
-	MTestFreeComm( &comm );
+        /* To improve reporting of problems about operations, we
+         * change the error handler to errors return */
+        MPI_Comm_set_errhandler(comm, MPI_ERRORS_RETURN);
+        if (leftGroup) {
+            err = MTest_Barrier(comm);
+            if (err) {
+                errs++;
+                MTestPrintError(err);
+            }
+        }
+        else {
+            /* In the right group */
+            err = MTest_Barrier(comm);
+            if (err) {
+                errs++;
+                MTestPrintError(err);
+            }
+        }
+        MTestFreeComm(&comm);
     }
 
-    MTest_Finalize( errs );
+    MTest_Finalize(errs);
     MPI_Finalize();
     return 0;
 }