fix+activate rma test

[simgrid.git] / teshsuite / smpi / mpich3-test / rma / lockcontention3.c

diff --git a/teshsuite/smpi/mpich3-test/rma/lockcontention3.c b/teshsuite/smpi/mpich3-test/rma/lockcontention3.c
index 134f412..d1ae7f6 100644 (file)
--- a/teshsuite/smpi/mpich3-test/rma/lockcontention3.c
+++ b/teshsuite/smpi/mpich3-test/rma/lockcontention3.c
@@ -313,24 +313,20 @@ int RMACheck(int i, int *buf, MPI_Aint bufsize)
         break;
     case 3:    /* Datatype single put (strided put) */
     case 6:    /* a few small puts (like strided put, but 1 word at a time) */
         break;
     case 3:    /* Datatype single put (strided put) */
     case 6:    /* a few small puts (like strided put, but 1 word at a time) */

-        /* FIXME: The conditional and increment are reversed below.  This looks
-         * like a bug, and currently prevents the following test from running. */

         for (j = 0; j < veccount; j++) {
         for (j = 0; j < veccount; j++) {

-            if (buf[j * stride] != PUT_VAL + j) {
+            if (buf[j * stride+OFFSET_1] != PUT_VAL + j) {

                 errs++;
                 errs++;

-                printf("case %d: value is %d should be %d\n", i, buf[j * stride], PUT_VAL + j);
+                printf("case %d: value is %d should be %d\n", i, buf[j * stride+OFFSET_1], PUT_VAL + j);

             }
         }
         break;
     case 4:    /* Datatype single accumulate (strided acc) */
     case 7:    /* a few small accumulates (like strided acc, but 1 word at a time) */
             }
         }
         break;
     case 4:    /* Datatype single accumulate (strided acc) */
     case 7:    /* a few small accumulates (like strided acc, but 1 word at a time) */

-        /* FIXME: The conditional and increment are reversed below.  This looks
-         * like a bug, and currently prevents the following test from running. */

         for (j = 0; j < veccount;j++) {
         for (j = 0; j < veccount;j++) {

-            if (buf[j * stride] != ACC_VAL + j + OFFSET_2 + j * stride) {
+            if (buf[j * stride+OFFSET_2] != ACC_VAL + j + OFFSET_2 + j * stride) {

                 errs++;
                 printf("case %d: value is %d should be %d\n", i,
                 errs++;
                 printf("case %d: value is %d should be %d\n", i,

-                       buf[j * stride], ACC_VAL + j + OFFSET_2 + j * stride);
+                       buf[j * stride+OFFSET_2], ACC_VAL + j + OFFSET_2 + j * stride);

             }
         }
         break;
             }
         }
         break;