From: Augustin Degomme <adegomme@users.noreply.github.com>
Date: Fri, 12 Jun 2020 10:37:59 +0000 (+0200)
Subject: speeling mistakes in teshsuite (even mpich tests because why not)
X-Git-Tag: v3.26~535
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/684cdb5583dacd359d0a1e6a47db259dbc82713b

speeling mistakes in teshsuite (even mpich tests because why not)
---

diff --git a/teshsuite/s4u/actor-suspend/actor-suspend.cpp b/teshsuite/s4u/actor-suspend/actor-suspend.cpp
index cab47290ba..b34d160df1 100644
--- a/teshsuite/s4u/actor-suspend/actor-suspend.cpp
+++ b/teshsuite/s4u/actor-suspend/actor-suspend.cpp
@@ -4,7 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 // This is the MWE of https://framagit.org/simgrid/simgrid/-/issues/50
-// The problem was occuring when suspending an actor that will be executed later in the same scheduling round
+// The problem was occurring when suspending an actor that will be executed later in the same scheduling round
 
 #include <iostream>
 #include <simgrid/s4u.hpp>
diff --git a/teshsuite/smpi/fort_args/fort_args.f90 b/teshsuite/smpi/fort_args/fort_args.f90
index 0e634ed320..dfd53083b5 100644
--- a/teshsuite/smpi/fort_args/fort_args.f90
+++ b/teshsuite/smpi/fort_args/fort_args.f90
@@ -1,4 +1,4 @@
-! Check that getarg does somethig sensible.
+! Check that getarg does something sensible.
 program getarg_1
   use mpi
   CHARACTER*10 ARGS, ARGS2
diff --git a/teshsuite/smpi/isp/umpire/change-send-buffer-type-exhaustive.c b/teshsuite/smpi/isp/umpire/change-send-buffer-type-exhaustive.c
index c770a4cb0a..9cbee5697c 100644
--- a/teshsuite/smpi/isp/umpire/change-send-buffer-type-exhaustive.c
+++ b/teshsuite/smpi/isp/umpire/change-send-buffer-type-exhaustive.c
@@ -105,7 +105,7 @@ main (int argc, char **argv)
 
   MPI_Type_extent (newtype[0], &basic_extent);
   if (basic_extent != sizeof (test_basic_struct_t)) {
-    fprintf (stderr, "(%d): Unexpect extent for struct\n");
+    fprintf (stderr, "(%d): Unexpected extent for struct\n");
     MPI_Abort (MPI_COMM_WORLD, 666);
   }
 
diff --git a/teshsuite/smpi/mpich3-test/attr/attrorder.c b/teshsuite/smpi/mpich3-test/attr/attrorder.c
index 0fd53bdc8d..28d1608c1f 100644
--- a/teshsuite/smpi/mpich3-test/attr/attrorder.c
+++ b/teshsuite/smpi/mpich3-test/attr/attrorder.c
@@ -96,7 +96,7 @@ int checkAttrs(MPI_Comm comm, int n, int key[], int attrval[])
         }
         else if (val_p != &attrval[i]) {
             errs++;
-            fprintf(stderr, "Atribute value for key %d not correct\n", i);
+            fprintf(stderr, "Attribute value for key %d not correct\n", i);
         }
     }
 
diff --git a/teshsuite/smpi/mpich3-test/attr/attrordercomm.c b/teshsuite/smpi/mpich3-test/attr/attrordercomm.c
index f2ea4e83c1..95ffa2d86d 100644
--- a/teshsuite/smpi/mpich3-test/attr/attrordercomm.c
+++ b/teshsuite/smpi/mpich3-test/attr/attrordercomm.c
@@ -96,7 +96,7 @@ int checkAttrs(MPI_Comm comm, int n, int key[], int attrval[])
         }
         else if (val_p != &attrval[i]) {
             errs++;
-            fprintf(stderr, "Atribute value for key %d not correct\n", i);
+            fprintf(stderr, "Attribute value for key %d not correct\n", i);
         }
     }
 
diff --git a/teshsuite/smpi/mpich3-test/attr/attrordertype.c b/teshsuite/smpi/mpich3-test/attr/attrordertype.c
index d3de828c33..837a02fd46 100644
--- a/teshsuite/smpi/mpich3-test/attr/attrordertype.c
+++ b/teshsuite/smpi/mpich3-test/attr/attrordertype.c
@@ -96,7 +96,7 @@ int checkAttrs(MPI_Datatype type, int n, int key[], int attrval[])
         }
         else if (val_p != &attrval[i]) {
             errs++;
-            fprintf(stderr, "Atribute value for key %d not correct\n", i);
+            fprintf(stderr, "Attribute value for key %d not correct\n", i);
         }
     }
 
diff --git a/teshsuite/smpi/mpich3-test/coll/allred4.c b/teshsuite/smpi/mpich3-test/coll/allred4.c
index 0efc44006c..93bc9f660d 100644
--- a/teshsuite/smpi/mpich3-test/coll/allred4.c
+++ b/teshsuite/smpi/mpich3-test/coll/allred4.c
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
 
     MPI_Op_create(matmult, 0, &op);
 
-    /* A single rotation matrix (3x3, stored as 9 consequetive elements) */
+    /* A single rotation matrix (3x3, stored as 9 consecutive elements) */
     MPI_Type_contiguous(9, MPI_INT, &mattype);
     MPI_Type_commit(&mattype);
 
diff --git a/teshsuite/smpi/mpich3-test/coll/alltoallw1.c b/teshsuite/smpi/mpich3-test/coll/alltoallw1.c
index cac4c5d0aa..529a2d0ba3 100644
--- a/teshsuite/smpi/mpich3-test/coll/alltoallw1.c
+++ b/teshsuite/smpi/mpich3-test/coll/alltoallw1.c
@@ -199,7 +199,7 @@ int main(int argc, char *argv[])
 
     /* Create the local matrices.
      * Initialize the input matrix so that the entries are
-     * consequtive integers, by row, starting at 0.
+     * consecutive integers, by row, starting at 0.
      */
     if (rank == size - 1) {
         localA = (float *) malloc(gN * lmlast * sizeof(float));
@@ -226,7 +226,7 @@ int main(int argc, char *argv[])
     Transpose(localA, localB, gM, gN, comm);
 
     /* check the transposed matrix
-     * In the global matrix, the transpose has consequtive integers,
+     * In the global matrix, the transpose has consecutive integers,
      * organized by columns.
      */
     if (rank == size - 1) {
diff --git a/teshsuite/smpi/mpich3-test/coll/coll10.c b/teshsuite/smpi/mpich3-test/coll/coll10.c
index e2a424af7e..d2a3981a80 100644
--- a/teshsuite/smpi/mpich3-test/coll/coll10.c
+++ b/teshsuite/smpi/mpich3-test/coll/coll10.c
@@ -16,7 +16,7 @@ int assoc(int *, int *, int *, MPI_Datatype *);
     (see 4.9.4).  The order is important.
 
     Note that the computation is in process rank (in the communicator)
-    order, independant of the root.
+    order, independent of the root.
  */
 int assoc(int *invec, int *inoutvec, int *len, MPI_Datatype * dtype)
 {
diff --git a/teshsuite/smpi/mpich3-test/coll/coll11.c b/teshsuite/smpi/mpich3-test/coll/coll11.c
index b79482e3a0..3c4e16abc2 100644
--- a/teshsuite/smpi/mpich3-test/coll/coll11.c
+++ b/teshsuite/smpi/mpich3-test/coll/coll11.c
@@ -24,7 +24,7 @@ void addem(int *invec, int *inoutvec, int *len, MPI_Datatype * dtype)
     (see 4.9.4).  The order is important.
 
     Note that the computation is in process rank (in the communicator)
-    order, independant of the root.
+    order, independent of the root.
  */
 void assoc(int *invec, int *inoutvec, int *len, MPI_Datatype * dtype)
 {
diff --git a/teshsuite/smpi/mpich3-test/coll/gather_big.c b/teshsuite/smpi/mpich3-test/coll/gather_big.c
index ce37c954e9..0b6ee4db16 100644
--- a/teshsuite/smpi/mpich3-test/coll/gather_big.c
+++ b/teshsuite/smpi/mpich3-test/coll/gather_big.c
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
         for (i = 0; i < size; i++) {
             for (j = 0; j < COUNT; j++) {
                 if (recvbuf[i * COUNT + j] != i * VERIFY_CONST + j) {
-                    printf("PE 0: mis-match error");
+                    printf("PE 0: mismatch error");
                     printf("  recbuf[%d * %d + %d] = ", i, COUNT, j);
                     printf("  %ld,", recvbuf[i * COUNT + j]);
                     printf("  should be %ld\n", i * VERIFY_CONST + j);
diff --git a/teshsuite/smpi/mpich3-test/coll/nonblocking3.c b/teshsuite/smpi/mpich3-test/coll/nonblocking3.c
index 76828b6ac4..2557c92a29 100644
--- a/teshsuite/smpi/mpich3-test/coll/nonblocking3.c
+++ b/teshsuite/smpi/mpich3-test/coll/nonblocking3.c
@@ -122,7 +122,7 @@ static void cleanup_laundry(struct laundry *l)
 }
 
 /* Starts a "random" operation on "comm" corresponding to "rndnum" and returns
- * in (*req) a request handle corresonding to that operation.  This call should
+ * in (*req) a request handle corresponding to that operation.  This call should
  * be considered collective over comm (with a consistent value for "rndnum"),
  * even though the operation may only be a point-to-point request. */
 static void start_random_nonblocking(MPI_Comm comm, unsigned int rndnum, MPI_Request * req,
diff --git a/teshsuite/smpi/mpich3-test/coll/opprod.c b/teshsuite/smpi/mpich3-test/coll/opprod.c
index 9c8001e6f4..83434d2f5b 100644
--- a/teshsuite/smpi/mpich3-test/coll/opprod.c
+++ b/teshsuite/smpi/mpich3-test/coll/opprod.c
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
     else
         maxsize = size;
 
-    /* General forumula: If we multiple the values from 1 to n, the
+    /* General formula: If we multiple the values from 1 to n, the
      * product is n!.  This grows very fast, so we'll only use the first
      * five (1! = 1, 2! = 2, 3! = 6, 4! = 24, 5! = 120), with n!
      * stored in the array result[n] */
diff --git a/teshsuite/smpi/mpich3-test/coll/red_scat_block2.c b/teshsuite/smpi/mpich3-test/coll/red_scat_block2.c
index ae886690b0..1ae353ae87 100644
--- a/teshsuite/smpi/mpich3-test/coll/red_scat_block2.c
+++ b/teshsuite/smpi/mpich3-test/coll/red_scat_block2.c
@@ -50,7 +50,7 @@ void right(void *a, void *b, int *count, MPI_Datatype * type)
 }
 
 /* Just performs a simple sum but can be marked as non-commutative to
-   potentially tigger different logic in the implementation. */
+   potentially trigger different logic in the implementation. */
 void nc_sum(void *a, void *b, int *count, MPI_Datatype * type);
 void nc_sum(void *a, void *b, int *count, MPI_Datatype * type)
 {
diff --git a/teshsuite/smpi/mpich3-test/coll/redscat2.c b/teshsuite/smpi/mpich3-test/coll/redscat2.c
index 1f59bcdc68..44af33a3eb 100644
--- a/teshsuite/smpi/mpich3-test/coll/redscat2.c
+++ b/teshsuite/smpi/mpich3-test/coll/redscat2.c
@@ -50,7 +50,7 @@ void right(void *a, void *b, int *count, MPI_Datatype * type)
 }
 
 /* Just performs a simple sum but can be marked as non-commutative to
-   potentially tigger different logic in the implementation. */
+   potentially trigger different logic in the implementation. */
 void nc_sum(void *a, void *b, int *count, MPI_Datatype * type);
 void nc_sum(void *a, void *b, int *count, MPI_Datatype * type)
 {
diff --git a/teshsuite/smpi/mpich3-test/coll/scantst.c b/teshsuite/smpi/mpich3-test/coll/scantst.c
index 12ddcad89b..153726d4f2 100644
--- a/teshsuite/smpi/mpich3-test/coll/scantst.c
+++ b/teshsuite/smpi/mpich3-test/coll/scantst.c
@@ -24,7 +24,7 @@ void addem(int *invec, int *inoutvec, int *len, MPI_Datatype * dtype)
     (see 4.9.4).  The order is important.
 
     Note that the computation is in process rank (in the communicator)
-    order, independant of the root.
+    order, independent of the root.
  */
 void assoc(int *invec, int *inoutvec, int *len, MPI_Datatype * dtype)
 {
diff --git a/teshsuite/smpi/mpich3-test/comm/comm_idup_iallreduce.c b/teshsuite/smpi/mpich3-test/comm/comm_idup_iallreduce.c
index b507a9b666..c3b92062d4 100644
--- a/teshsuite/smpi/mpich3-test/comm/comm_idup_iallreduce.c
+++ b/teshsuite/smpi/mpich3-test/comm/comm_idup_iallreduce.c
@@ -13,18 +13,18 @@
 #define ITERS 10
 
 /* This test uses several scenarios to overlap iallreduce and comm_idup
- * 1.)  Use comm_idup  dublicate the COMM_WORLD and do iallreduce
+ * 1.)  Use comm_idup  duplicate the COMM_WORLD and do iallreduce
  *      on the COMM_WORLD
  * 2.)  Do the above test in a loop
- * 3.)  Dublicate  COMM_WORLD, overalp iallreduce on one
+ * 3.)  Duplicate  COMM_WORLD, overalp iallreduce on one
  *      communicator with comm_idup on the nother communicator
  * 4.)  Split MPI_COMM_WORLD, communicate on the split communicator
         while dublicating COMM_WORLD
  *  5.) Duplicate the split communicators with comm_idup
  *      while communicating  onCOMM_WORLD
- *  6.) Ceate an inter-communicator and duplicate it with comm_idup while
+ *  6.) Create an inter-communicator and duplicate it with comm_idup while
  *      communicating on the inter-communicator
- *  7.) Dublicate the inter-communicator whil communicate on COMM_WORLD
+ *  7.) Duplicate the inter-communicator whil communicate on COMM_WORLD
  *  8.) Merge the inter-communicator to an intra-communicator and idup it,
  *      overlapping with communication on MPI_COMM_WORLD
  *  9.) Communicate on the merge communicator, while duplicating COMM_WORLD
diff --git a/teshsuite/smpi/mpich3-test/comm/commname.c b/teshsuite/smpi/mpich3-test/comm/commname.c
index ed52049f48..d8ae639253 100644
--- a/teshsuite/smpi/mpich3-test/comm/commname.c
+++ b/teshsuite/smpi/mpich3-test/comm/commname.c
@@ -22,7 +22,7 @@ int main(int argc, char *argv[])
     char name[MPI_MAX_OBJECT_NAME], nameout[MPI_MAX_OBJECT_NAME];
     MTest_Init(&argc, &argv);
 
-    /* Check world and self firt */
+    /* Check world and self first */
     nameout[0] = 0;
     MPI_Comm_get_name(MPI_COMM_WORLD, nameout, &rlen);
     if (strcmp(nameout, "MPI_COMM_WORLD")) {
diff --git a/teshsuite/smpi/mpich3-test/comm/dupic.c b/teshsuite/smpi/mpich3-test/comm/dupic.c
index e3712769fa..974d0f06d5 100644
--- a/teshsuite/smpi/mpich3-test/comm/dupic.c
+++ b/teshsuite/smpi/mpich3-test/comm/dupic.c
@@ -14,7 +14,7 @@ int main(int argc, char *argv[])
     MPI_Comm comm, dupcomm, dupcomm2;
     MPI_Request rreq[2];
     int count;
-    int indicies[2];
+    int indices[2];
     int r1buf, r2buf, s1buf, s2buf;
     int rank, isLeft;
 
@@ -40,12 +40,12 @@ int main(int argc, char *argv[])
             MPI_Irecv(&r1buf, 1, MPI_INT, 0, 0, dupcomm, &rreq[0]);
             MPI_Irecv(&r2buf, 1, MPI_INT, 0, 0, comm, &rreq[1]);
             MPI_Send(&s2buf, 1, MPI_INT, 0, 0, comm);
-            MPI_Waitsome(2, rreq, &count, indicies, MPI_STATUSES_IGNORE);
-            if (count != 1 || indicies[0] != 1) {
+            MPI_Waitsome(2, rreq, &count, indices, MPI_STATUSES_IGNORE);
+            if (count != 1 || indices[0] != 1) {
                 /* The only valid return is that exactly one message
                  * has been received */
                 errs++;
-                if (count == 1 && indicies[0] != 1) {
+                if (count == 1 && indices[0] != 1) {
                     printf("Error in context values for intercomm\n");
                 }
                 else if (count == 2) {
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
                     int i;
                     printf("Error: count = %d", count);
                     for (i = 0; i < count; i++) {
-                        printf(" indicies[%d] = %d", i, indicies[i]);
+                        printf(" indices[%d] = %d", i, indices[i]);
                     }
                     printf("\n");
                 }
diff --git a/teshsuite/smpi/mpich3-test/datatype/blockindexed-misc.c b/teshsuite/smpi/mpich3-test/datatype/blockindexed-misc.c
index d26720587b..338c6d1ad8 100644
--- a/teshsuite/smpi/mpich3-test/datatype/blockindexed-misc.c
+++ b/teshsuite/smpi/mpich3-test/datatype/blockindexed-misc.c
@@ -149,7 +149,7 @@ int blockindexed_contig_test(void)
 /* blockindexed_vector_test()
  *
  * Tests behavior with a blockindexed of some vector types;
- * this shouldn't be easily convertable into anything else.
+ * this shouldn't be easily convertible into anything else.
  *
  * Returns the number of errors encountered.
  */
diff --git a/teshsuite/smpi/mpich3-test/datatype/hindexed_block.c b/teshsuite/smpi/mpich3-test/datatype/hindexed_block.c
index 5f00009e26..5c975fc95f 100644
--- a/teshsuite/smpi/mpich3-test/datatype/hindexed_block.c
+++ b/teshsuite/smpi/mpich3-test/datatype/hindexed_block.c
@@ -161,7 +161,7 @@ int hindexed_block_contig_test(void)
 /* hindexed_block_vector_test()
  *
  * Tests behavior with a hindexed_block of some vector types;
- * this shouldn't be easily convertable into anything else.
+ * this shouldn't be easily convertible into anything else.
  *
  * Returns the number of errors encountered.
  */
diff --git a/teshsuite/smpi/mpich3-test/datatype/large_type.c b/teshsuite/smpi/mpich3-test/datatype/large_type.c
index 48a256d532..eb6b2cd334 100644
--- a/teshsuite/smpi/mpich3-test/datatype/large_type.c
+++ b/teshsuite/smpi/mpich3-test/datatype/large_type.c
@@ -17,7 +17,7 @@ static MPI_Datatype make_largexfer_type_struct(MPI_Offset nbytes)
     int remainder = 0;
     MPI_Datatype memtype, chunktype;
 
-    /* need to cook up a new datatype to accomodate large datatypes */
+    /* need to cook up a new datatype to accommodate large datatypes */
     /* first pass: chunks of 1 MiB plus an additional remainder.  Does require
      * 8 byte MPI_Aint, which should have been checked for earlier */
 
@@ -56,7 +56,7 @@ static MPI_Datatype make_largexfer_type_hindexed(MPI_Offset nbytes)
     MPI_Aint *disp;
     MPI_Datatype memtype;
 
-    /* need to cook up a new datatype to accomodate large datatypes */
+    /* need to cook up a new datatype to accommodate large datatypes */
     /* Does require 8 byte MPI_Aint, which should have been checked for earlier
      */
 
diff --git a/teshsuite/smpi/mpich3-test/datatype/lbub.c b/teshsuite/smpi/mpich3-test/datatype/lbub.c
index b1c48248eb..158b66b35f 100644
--- a/teshsuite/smpi/mpich3-test/datatype/lbub.c
+++ b/teshsuite/smpi/mpich3-test/datatype/lbub.c
@@ -1135,7 +1135,7 @@ int int_with_negextent_test(void)
             fprintf(stderr, "  MPI_Type_struct of %s failed.\n", typemapstring);
         if (verbose)
             MTestPrintError(err);
-        /* No point in contiuing */
+        /* No point in continuing */
         return errs;
     }
 
diff --git a/teshsuite/smpi/mpich3-test/datatype/typename.c b/teshsuite/smpi/mpich3-test/datatype/typename.c
index 8ff1fc0f3d..ca8d1dce04 100644
--- a/teshsuite/smpi/mpich3-test/datatype/typename.c
+++ b/teshsuite/smpi/mpich3-test/datatype/typename.c
@@ -124,7 +124,7 @@ mpi_names_t mpi_names[] = {
     /* added in MPI 3 */
     { MPI_COUNT, "MPI_COUNT" },
 #endif
-    { 0, (char *)0 },  /* Sentinal used to indicate the last element */
+    { 0, (char *)0 },  /* Sentinel used to indicate the last element */
 };
 
     char name[MPI_MAX_OBJECT_NAME];
diff --git a/teshsuite/smpi/mpich3-test/errhan/errfatal.c b/teshsuite/smpi/mpich3-test/errhan/errfatal.c
index 0e9f55a8e2..e95a7cab56 100644
--- a/teshsuite/smpi/mpich3-test/errhan/errfatal.c
+++ b/teshsuite/smpi/mpich3-test/errhan/errfatal.c
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
 
     /* We should not get here, because the default error handler
      * is ERRORS_ARE_FATAL.  This makes sure that the correct error
-     * handler is called and that no failure occured (such as
+     * handler is called and that no failure occurred (such as
      * a SEGV) in Comm_call_errhandler on the default
      * error handler. */
     printf("After the Error Handler Has Been Called\n");
diff --git a/teshsuite/smpi/mpich3-test/f77/ext/c2fmult.c b/teshsuite/smpi/mpich3-test/f77/ext/c2fmult.c
index 4f1d343838..8f81d40d53 100644
--- a/teshsuite/smpi/mpich3-test/f77/ext/c2fmult.c
+++ b/teshsuite/smpi/mpich3-test/f77/ext/c2fmult.c
@@ -50,7 +50,7 @@ int main( int argc, char *argv[] )
 	printf( "Unable to cancel MPI_Irecv request\n" );
     }
     /* Using MPI_Request_free should be ok, but some MPI implementations
-       object to it imediately after the cancel and that isn't essential to
+       object to it immediately after the cancel and that isn't essential to
        this test */
 
     MTest_Finalize( errs );
diff --git a/teshsuite/smpi/mpich3-test/f77/ext/ctypesfromc.c b/teshsuite/smpi/mpich3-test/f77/ext/ctypesfromc.c
index e0e5f60d92..8775b83d81 100644
--- a/teshsuite/smpi/mpich3-test/f77/ext/ctypesfromc.c
+++ b/teshsuite/smpi/mpich3-test/f77/ext/ctypesfromc.c
@@ -64,7 +64,7 @@ static mpi_names_t mpi_names[] = {
     { MPI_LONG_LONG, "MPI_LONG_LONG" },
     { MPI_UNSIGNED_LONG_LONG, "MPI_UNSIGNED_LONG_LONG" },
     { MPI_LONG_DOUBLE_INT, "MPI_LONG_DOUBLE_INT" },
-    { 0, (char *)0 },  /* Sentinal used to indicate the last element */
+    { 0, (char *)0 },  /* Sentinel used to indicate the last element */
 };
 
 /*
diff --git a/teshsuite/smpi/mpich3-test/f77/topo/cartcrf.f b/teshsuite/smpi/mpich3-test/f77/topo/cartcrf.f
index a23c178812..e6d046b53c 100644
--- a/teshsuite/smpi/mpich3-test/f77/topo/cartcrf.f
+++ b/teshsuite/smpi/mpich3-test/f77/topo/cartcrf.f
@@ -22,7 +22,7 @@ C
       call mtest_init( ierr )
 
 C
-C     For upto 6 dimensions, test with periodicity in 0 through all
+C     For up to 6 dimensions, test with periodicity in 0 through all
 C     dimensions.  The test is computed by both:
 C         get info about the created communicator
 C         apply cart shift
diff --git a/teshsuite/smpi/mpich3-test/f77/topo/dgraph_unwgtf.f b/teshsuite/smpi/mpich3-test/f77/topo/dgraph_unwgtf.f
index f040a86f0e..23f54f26cc 100644
--- a/teshsuite/smpi/mpich3-test/f77/topo/dgraph_unwgtf.f
+++ b/teshsuite/smpi/mpich3-test/f77/topo/dgraph_unwgtf.f
@@ -154,7 +154,7 @@ C     the nearest neighbors that within a ring.
 
 C now create one with MPI_WEIGHTS_EMPTY
 C NOTE that MPI_WEIGHTS_EMPTY was added in MPI-3 and does not 
-C appear before then.  Incluing this test means that this test cannot
+C appear before then.  Including this test means that this test cannot
 C be compiled if the MPI version is less than 3 (see the testlist file)
 
       degs(1) = 0;
diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/createf90.f90 b/teshsuite/smpi/mpich3-test/f90/datatype/createf90.f90
index b2edf87b6f..7672858202 100644
--- a/teshsuite/smpi/mpich3-test/f90/datatype/createf90.f90
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/createf90.f90
@@ -16,7 +16,7 @@
         errs = 0
         call mtest_init( ierr )
 
-! integers with upto 9 are 4 bytes integers; r of 4 are 2 byte,
+! integers with up to 9 are 4 bytes integers; r of 4 are 2 byte,
 ! and r of 2 is 1 byte
         call mpi_type_create_f90_integer( 9, ntype1, ierr )
 !
diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/kinds.f90 b/teshsuite/smpi/mpich3-test/f90/datatype/kinds.f90
index 3d42946571..fd22c58aff 100644
--- a/teshsuite/smpi/mpich3-test/f90/datatype/kinds.f90
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/kinds.f90
@@ -90,19 +90,19 @@
      endif
      call MPI_RECV( aint, 1, MPI_AINT, 0, 0, MPI_COMM_WORLD, s, ierr )
      if (taint .ne. aint) then
-        print *, "Address-sized int not correctly transfered"
+        print *, "Address-sized int not correctly transferred"
         print *, "Value should be ", taint, " but is ", aint
         errs = errs + 1
      endif
      call MPI_RECV( oint, 1, MPI_OFFSET, 0, 1, MPI_COMM_WORLD, s, ierr )
      if (toint .ne. oint) then
-        print *, "Offset-sized int not correctly transfered"
+        print *, "Offset-sized int not correctly transferred"
         print *, "Value should be ", toint, " but is ", oint
         errs = errs + 1
      endif
      call MPI_RECV( iint, 1, MPI_INTEGER, 0, 2, MPI_COMM_WORLD, s, ierr )
      if (tiint .ne. iint) then
-        print *, "Integer (by kind) not correctly transfered"
+        print *, "Integer (by kind) not correctly transferred"
         print *, "Value should be ", tiint, " but is ", iint
         errs = errs + 1
      endif
diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/structf.f90 b/teshsuite/smpi/mpich3-test/f90/datatype/structf.f90
index dbdc86101c..b2118b69b5 100644
--- a/teshsuite/smpi/mpich3-test/f90/datatype/structf.f90
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/structf.f90
@@ -73,7 +73,7 @@
           call mpi_type_free(newtype,ierr)
 !         write(*,*) "Sent ",name(1:5),x
       else 
-!         Everyone calls barrier incase size > 2
+!         Everyone calls barrier in case size > 2
           call mpi_barrier( MPI_COMM_WORLD, ierr )
           if (me.eq.dest) then
              position=0
diff --git a/teshsuite/smpi/mpich3-test/group/grouptest.c b/teshsuite/smpi/mpich3-test/group/grouptest.c
index c2904deb60..64f3deeacc 100644
--- a/teshsuite/smpi/mpich3-test/group/grouptest.c
+++ b/teshsuite/smpi/mpich3-test/group/grouptest.c
@@ -21,7 +21,7 @@ int main(int argc, char *argv[])
     MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
     MPI_Comm_size(MPI_COMM_WORLD, &size);
     if (size < 8) {
-        fprintf(stderr, "Test requires 8 processes (16 prefered) only %d provided\n", size);
+        fprintf(stderr, "Test requires 8 processes (16 preferred) only %d provided\n", size);
         errs++;
     }
 
diff --git a/teshsuite/smpi/mpich3-test/group/grouptest2.c b/teshsuite/smpi/mpich3-test/group/grouptest2.c
index 16bbaab507..505319312b 100644
--- a/teshsuite/smpi/mpich3-test/group/grouptest2.c
+++ b/teshsuite/smpi/mpich3-test/group/grouptest2.c
@@ -7,7 +7,7 @@
 
 /*
    Test the group routines
-   (some tested elsewere)
+   (some tested elsewhere)
 
 MPI_Group_compare
 MPI_Group_excl
diff --git a/teshsuite/smpi/mpich3-test/info/infodel.c b/teshsuite/smpi/mpich3-test/info/infodel.c
index b281847769..aa6eb48188 100644
--- a/teshsuite/smpi/mpich3-test/info/infodel.c
+++ b/teshsuite/smpi/mpich3-test/info/infodel.c
@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
     MTest_Init(&argc, &argv);
 
     MPI_Info_create(&info);
-    /* Use only named keys incase the info implementation only supports
+    /* Use only named keys in case the info implementation only supports
      * the predefined keys (e.g., IBM) */
     for (i = 0; i < NKEYS; i++) {
         MPI_Info_set(info, keys[i], values[i]);
diff --git a/teshsuite/smpi/mpich3-test/info/infodup.c b/teshsuite/smpi/mpich3-test/info/infodup.c
index 4c79749d22..cbce96b9d1 100644
--- a/teshsuite/smpi/mpich3-test/info/infodup.c
+++ b/teshsuite/smpi/mpich3-test/info/infodup.c
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
     MTest_Init(&argc, &argv);
 
     MPI_Info_create(&info1);
-    /* Use only named keys incase the info implementation only supports
+    /* Use only named keys in case the info implementation only supports
      * the predefined keys (e.g., IBM) */
     MPI_Info_set(info1, (char *) "host", (char *) "myhost.myorg.org");
     MPI_Info_set(info1, (char *) "file", (char *) "runfile.txt");
diff --git a/teshsuite/smpi/mpich3-test/info/infoorder.c b/teshsuite/smpi/mpich3-test/info/infoorder.c
index e1189c46a2..d859a91cc4 100644
--- a/teshsuite/smpi/mpich3-test/info/infoorder.c
+++ b/teshsuite/smpi/mpich3-test/info/infoorder.c
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 
     /* 1,2,3 */
     MPI_Info_create(&info);
-    /* Use only named keys incase the info implementation only supports
+    /* Use only named keys in case the info implementation only supports
      * the predefined keys (e.g., IBM) */
     for (i = 0; i < NKEYS; i++) {
         MPI_Info_set(info, keys1[i], values1[i]);
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 
     /* 3,2,1 */
     MPI_Info_create(&info);
-    /* Use only named keys incase the info implementation only supports
+    /* Use only named keys in case the info implementation only supports
      * the predefined keys (e.g., IBM) */
     for (i = NKEYS - 1; i >= 0; i--) {
         MPI_Info_set(info, keys1[i], values1[i]);
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 
     /* 1,3,2 */
     MPI_Info_create(&info);
-    /* Use only named keys incase the info implementation only supports
+    /* Use only named keys in case the info implementation only supports
      * the predefined keys (e.g., IBM) */
     MPI_Info_set(info, keys1[0], values1[0]);
     MPI_Info_set(info, keys1[2], values1[2]);
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
 
     /* 2,1,3 */
     MPI_Info_create(&info);
-    /* Use only named keys incase the info implementation only supports
+    /* Use only named keys in case the info implementation only supports
      * the predefined keys (e.g., IBM) */
     MPI_Info_set(info, keys1[1], values1[1]);
     MPI_Info_set(info, keys1[0], values1[0]);
@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
 
     /* 2,3,1 */
     MPI_Info_create(&info);
-    /* Use only named keys incase the info implementation only supports
+    /* Use only named keys in case the info implementation only supports
      * the predefined keys (e.g., IBM) */
     MPI_Info_set(info, keys1[1], values1[1]);
     MPI_Info_set(info, keys1[2], values1[2]);
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
 
     /* 3,1,2 */
     MPI_Info_create(&info);
-    /* Use only named keys incase the info implementation only supports
+    /* Use only named keys in case the info implementation only supports
      * the predefined keys (e.g., IBM) */
     MPI_Info_set(info, keys1[2], values1[2]);
     MPI_Info_set(info, keys1[0], values1[0]);
diff --git a/teshsuite/smpi/mpich3-test/info/infovallen.c b/teshsuite/smpi/mpich3-test/info/infovallen.c
index 22fbfe5d1a..39cf7070e4 100644
--- a/teshsuite/smpi/mpich3-test/info/infovallen.c
+++ b/teshsuite/smpi/mpich3-test/info/infovallen.c
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
     MTest_Init(&argc, &argv);
 
     MPI_Info_create(&info);
-    /* Use only named keys incase the info implementation only supports
+    /* Use only named keys in case the info implementation only supports
      * the predefined keys (e.g., IBM) */
     for (i = 0; i < NKEYS; i++) {
         MPI_Info_set(info, keys[i], values[i]);
diff --git a/teshsuite/smpi/mpich3-test/init/attrself.c b/teshsuite/smpi/mpich3-test/init/attrself.c
index 027a413c32..bbbcd9c714 100644
--- a/teshsuite/smpi/mpich3-test/init/attrself.c
+++ b/teshsuite/smpi/mpich3-test/init/attrself.c
@@ -97,7 +97,7 @@ int checkAttrs(MPI_Comm comm, int n, int lkey[], int attrval[])
         }
         else if (val_p != &attrval[i]) {
             lerrs++;
-            fprintf(stderr, "Atribute value for key %d not correct\n", i);
+            fprintf(stderr, "Attribute value for key %d not correct\n", i);
         }
     }
 
diff --git a/teshsuite/smpi/mpich3-test/io/i_noncontig_coll2.c b/teshsuite/smpi/mpich3-test/io/i_noncontig_coll2.c
index 35466b4cee..57a4868a3a 100644
--- a/teshsuite/smpi/mpich3-test/io/i_noncontig_coll2.c
+++ b/teshsuite/smpi/mpich3-test/io/i_noncontig_coll2.c
@@ -15,7 +15,7 @@
  *
  * . generalized file writing/reading to handle arbitrary number of processors
  * . provides the "cb_config_list" hint with several permutations of the
- *   avaliable processors.
+ *   available processors.
  *   [ makes use of code copied from ROMIO's ADIO code to collect the names of
  *   the processors ]
  */
diff --git a/teshsuite/smpi/mpich3-test/io/simple_collective.c b/teshsuite/smpi/mpich3-test/io/simple_collective.c
index 2acc2bcef8..2c5699b1d8 100644
--- a/teshsuite/smpi/mpich3-test/io/simple_collective.c
+++ b/teshsuite/smpi/mpich3-test/io/simple_collective.c
@@ -6,7 +6,7 @@
 
 
 /* this deceptively simple test uncovered a bug in the way certain file systems
- * dealt with tuning parmeters.  See
+ * dealt with tuning parameters.  See
  * https://github.com/open-mpi/ompi/issues/158 and
  * http://trac.mpich.org/projects/mpich/ticket/2261
  *
@@ -110,7 +110,7 @@ int main(int argc, char **argv)
     sprintf(file, "%s", opt_file);
     MPI_Info_create(&info);
     nr_errors += test_write(file, nprocs, rank, info);
-    /* acutal value does not matter.  test only writes a small amount of data */
+    /* actual value does not matter.  test only writes a small amount of data */
     MPI_Info_set(info, "striping_factor", "50");
     nr_errors += test_write(file, nprocs, rank, info);
     MPI_Info_free(&info);
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/anyall.c b/teshsuite/smpi/mpich3-test/pt2pt/anyall.c
index 405c794804..8e7557cc94 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/anyall.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/anyall.c
@@ -11,7 +11,7 @@
 #define MAX_MSGS 30
 
 /*
-static char MTEST_Descrip[] = "One implementation delivered incorrect data when an MPI recieve uses both ANY_SOURCE and ANY_TAG";
+static char MTEST_Descrip[] = "One implementation delivered incorrect data when an MPI receive uses both ANY_SOURCE and ANY_TAG";
 */
 
 int main(int argc, char *argv[])
diff --git a/teshsuite/smpi/mpich3-test/pt2pt/bsendalign.c b/teshsuite/smpi/mpich3-test/pt2pt/bsendalign.c
index ec358e66d3..c01343e77b 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/bsendalign.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/bsendalign.c
@@ -8,7 +8,7 @@
 #include "mpi.h"
 #include "mpitest.h"
 
-/* Test bsend with a buffer with arbitray alignment */
+/* Test bsend with a buffer with arbitrary alignment */
 #define BUFSIZE 2000*4
 int main(int argc, char *argv[])
 {
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
         if (bptr != buf + align) {
             errs++;
             printf
-                ("Did not recieve the same buffer on detach that was provided on init (%p vs %p)\n",
+                ("Did not receive the same buffer on detach that was provided on init (%p vs %p)\n",
                  bptr, buf);
         }
     }
diff --git a/teshsuite/smpi/mpich3-test/rma/accfence1.c b/teshsuite/smpi/mpich3-test/rma/accfence1.c
index f4b8930d6b..ef71a3daec 100644
--- a/teshsuite/smpi/mpich3-test/rma/accfence1.c
+++ b/teshsuite/smpi/mpich3-test/rma/accfence1.c
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
                 else if (rank == dest) {
                     MPI_Win_fence(0, win);
                     /* This should have the same effect, in terms of
-                     * transfering data, as a send/recv pair */
+                     * transferring data, as a send/recv pair */
                     err = MTestCheckRecv(0, &recvtype);
                     if (err) {
                         errs += err;
diff --git a/teshsuite/smpi/mpich3-test/rma/accpscw1.c b/teshsuite/smpi/mpich3-test/rma/accpscw1.c
index 67ab3b48bf..dd9162ceb6 100644
--- a/teshsuite/smpi/mpich3-test/rma/accpscw1.c
+++ b/teshsuite/smpi/mpich3-test/rma/accpscw1.c
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
                     MPI_Group_free(&neighbors);
                     MPI_Win_wait(win);
                     /* This should have the same effect, in terms of
-                     * transfering data, as a send/recv pair */
+                     * transferring data, as a send/recv pair */
                     err = MTestCheckRecv(0, &recvtype);
                     if (err) {
                         errs += errs;
diff --git a/teshsuite/smpi/mpich3-test/rma/atomic_rmw_gacc.c b/teshsuite/smpi/mpich3-test/rma/atomic_rmw_gacc.c
index 0e73e2d4a7..9a7eafeb3b 100644
--- a/teshsuite/smpi/mpich3-test/rma/atomic_rmw_gacc.c
+++ b/teshsuite/smpi/mpich3-test/rma/atomic_rmw_gacc.c
@@ -8,11 +8,11 @@
 /* This test is going to test the atomicity for "read-modify-write" in GACC
  * operations */
 
-/* This test is similiar with atomic_rmw_fop.c.
+/* This test is similar with atomic_rmw_fop.c.
  * There are three processes involved in this test: P0 (origin_shm), P1 (origin_am),
  * and P2 (dest). P0 and P1 issues multiple GACC with MPI_SUM and OP_COUNT integers
  * (value 1) to P2 via SHM and AM respectively. The correct results should be that the
- * results on P0 and P1 never be the same for intergers on the corresponding index
+ * results on P0 and P1 never be the same for integers on the corresponding index
  * in [0...OP_COUNT-1].
  */
 
diff --git a/teshsuite/smpi/mpich3-test/rma/attrorderwin.c b/teshsuite/smpi/mpich3-test/rma/attrorderwin.c
index 9d6ef8721d..14723e88eb 100644
--- a/teshsuite/smpi/mpich3-test/rma/attrorderwin.c
+++ b/teshsuite/smpi/mpich3-test/rma/attrorderwin.c
@@ -101,7 +101,7 @@ int checkAttrs(MPI_Win win, int n, int key[], int attrval[])
         }
         else if (val_p != &attrval[i]) {
             errs++;
-            fprintf(stderr, "Atribute value for key %d not correct\n", i);
+            fprintf(stderr, "Attribute value for key %d not correct\n", i);
         }
     }
 
diff --git a/teshsuite/smpi/mpich3-test/rma/contention_put.c b/teshsuite/smpi/mpich3-test/rma/contention_put.c
index 28b99524a7..9dff333762 100644
--- a/teshsuite/smpi/mpich3-test/rma/contention_put.c
+++ b/teshsuite/smpi/mpich3-test/rma/contention_put.c
@@ -7,7 +7,7 @@
 /** Contended RMA put test -- James Dinan <dinan@mcs.anl.gov>
   *
   * Each process issues COUNT put operations to non-overlapping locations on
-  * every other processs.
+  * every other process.
   */
 
 #include <stdio.h>
diff --git a/teshsuite/smpi/mpich3-test/rma/contention_putget.c b/teshsuite/smpi/mpich3-test/rma/contention_putget.c
index abfdb2bbe5..4f25827cff 100644
--- a/teshsuite/smpi/mpich3-test/rma/contention_putget.c
+++ b/teshsuite/smpi/mpich3-test/rma/contention_putget.c
@@ -7,7 +7,7 @@
 /** Contended RMA put/get test -- James Dinan <dinan@mcs.anl.gov>
   *
   * Each process issues COUNT put and get operations to non-overlapping
-  * locations on every other processs.
+  * locations on every other process.
   */
 
 #include <stdio.h>
diff --git a/teshsuite/smpi/mpich3-test/rma/getfence1.c b/teshsuite/smpi/mpich3-test/rma/getfence1.c
index 6b068930f7..80bf6f1863 100644
--- a/teshsuite/smpi/mpich3-test/rma/getfence1.c
+++ b/teshsuite/smpi/mpich3-test/rma/getfence1.c
@@ -52,7 +52,7 @@ static inline int test(MPI_Comm comm, int rank, int source, int dest,
         MPI_Win_set_errhandler(win, MPI_ERRORS_RETURN);
 
         /* This should have the same effect, in terms of
-         * transfering data, as a send/recv pair */
+         * transferring data, as a send/recv pair */
         err = MPI_Get(recvtype->buf, recvtype->count,
                       recvtype->datatype, source, 0, sendtype->count, sendtype->datatype, win);
         if (err) {
diff --git a/teshsuite/smpi/mpich3-test/rma/mixedsync.c b/teshsuite/smpi/mpich3-test/rma/mixedsync.c
index 0bf63c3c5b..72e9042963 100644
--- a/teshsuite/smpi/mpich3-test/rma/mixedsync.c
+++ b/teshsuite/smpi/mpich3-test/rma/mixedsync.c
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
         /* Perform several communication operations, mixing synchronization
          * types.  Use multiple communication to avoid the single-operation
          * optimization that may be present. */
-        MTestPrintfMsg(3, "Begining loop %d of mixed sync put/acc operations\n", loop);
+        MTestPrintfMsg(3, "Beginning loop %d of mixed sync put/acc operations\n", loop);
         memset(winbuf, 0, count * sizeof(int));
         MPI_Barrier(comm);
         if (crank == source) {
@@ -173,7 +173,7 @@ int main(int argc, char *argv[])
         /* Perform several communication operations, mixing synchronization
          * types.  Use multiple communication to avoid the single-operation
          * optimization that may be present. */
-        MTestPrintfMsg(3, "Begining loop %d of mixed sync put/get/acc operations\n", loop);
+        MTestPrintfMsg(3, "Beginning loop %d of mixed sync put/get/acc operations\n", loop);
         MPI_Barrier(comm);
         if (crank == source) {
             MPI_Win_lock(MPI_LOCK_EXCLUSIVE, dest, 0, win);
diff --git a/teshsuite/smpi/mpich3-test/rma/putfence1.c b/teshsuite/smpi/mpich3-test/rma/putfence1.c
index 4f49bea9ff..68fb5a027a 100644
--- a/teshsuite/smpi/mpich3-test/rma/putfence1.c
+++ b/teshsuite/smpi/mpich3-test/rma/putfence1.c
@@ -61,7 +61,7 @@ static inline int test(MPI_Comm comm, int rank, int source, int dest,
     else if (rank == dest) {
         MPI_Win_fence(0, win);
         /* This should have the same effect, in terms of
-         * transfering data, as a send/recv pair */
+         * transferring data, as a send/recv pair */
         err = MTestCheckRecv(0, recvtype);
         if (err) {
             if (errs < 10) {
diff --git a/teshsuite/smpi/mpich3-test/rma/putpscw1.c b/teshsuite/smpi/mpich3-test/rma/putpscw1.c
index d46c8f98ff..e8cbfd08a7 100644
--- a/teshsuite/smpi/mpich3-test/rma/putpscw1.c
+++ b/teshsuite/smpi/mpich3-test/rma/putpscw1.c
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
                     MPI_Group_free(&neighbors);
                     MPI_Win_wait(win);
                     /* This should have the same effect, in terms of
-                     * transfering data, as a send/recv pair */
+                     * transferring data, as a send/recv pair */
                     err = MTestCheckRecv(0, &recvtype);
                     if (err) {
                         errs += errs;
diff --git a/teshsuite/smpi/mpich3-test/runtests b/teshsuite/smpi/mpich3-test/runtests
index 987787e3cd..4d458482f7 100755
--- a/teshsuite/smpi/mpich3-test/runtests
+++ b/teshsuite/smpi/mpich3-test/runtests
@@ -724,7 +724,7 @@ sub AddMPIProgram {
 
     if ($ResultTest ne "") {
 	# This test really needs to be run manually, with this test
-	# Eventually, we can update this to include handleing in checktests.
+	# Eventually, we can update this to include handling in checktests.
 	print STDERR "Run $curdir/$programname with $np processes and use $ResultTest to check the results\n";
 	return;
     }
diff --git a/teshsuite/smpi/mpich3-test/util/dtypes.c b/teshsuite/smpi/mpich3-test/util/dtypes.c
index b93fc9b713..239d4011e4 100644
--- a/teshsuite/smpi/mpich3-test/util/dtypes.c
+++ b/teshsuite/smpi/mpich3-test/util/dtypes.c
@@ -139,7 +139,7 @@ static int basic_only = 0;
   free(myname); \
   counts[cnt]  = 1;  bytesize[cnt] = sizeof(_ctype) * (_count); cnt++; }
 
-/* This defines a structure of two basic members; by chosing things like
+/* This defines a structure of two basic members; by choosing things like
    (char, double), various packing and alignment tests can be made */
 #define SETUPSTRUCT2TYPE(_mpitype1,_ctype1,_mpitype2,_ctype2,_count,_tname) { \
   int i; char *myname;						\
diff --git a/teshsuite/smpi/mpich3-test/util/mtest.c b/teshsuite/smpi/mpich3-test/util/mtest.c
index cb24b3239d..b68178ee91 100644
--- a/teshsuite/smpi/mpich3-test/util/mtest.c
+++ b/teshsuite/smpi/mpich3-test/util/mtest.c
@@ -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;
                 }
diff --git a/teshsuite/smpi/topo-cart-sub/topo-cart-sub.c b/teshsuite/smpi/topo-cart-sub/topo-cart-sub.c
index e0c4146b96..dc6dfb72c6 100644
--- a/teshsuite/smpi/topo-cart-sub/topo-cart-sub.c
+++ b/teshsuite/smpi/topo-cart-sub/topo-cart-sub.c
@@ -68,7 +68,7 @@ int main(int argc, char** argv)
 
   MPI_Barrier(MPI_COMM_WORLD);
 
-  /* Set dims[] values to descibe a grid of nbNodes and DIM dimensions*/
+  /* Set dims[] values to describe a grid of nbNodes and DIM dimensions*/
   MPI_Cart_create(MPI_COMM_WORLD, DIM, dims, periods, reorder, &gridComm);
 
   if (gridComm == MPI_COMM_NULL)