From: Augustin Degomme <adegomme@gmail.com>
Date: Wed, 10 Jul 2019 13:35:36 +0000 (+0200)
Subject: fix+activate rma test
X-Git-Tag: v3.24~345
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/09601ee5e16b23f0b9e8f65c2c00b0cf2dd5d901

fix+activate rma test
---

diff --git a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
index 2e82577705..de3194a64e 100644
--- a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
@@ -16,13 +16,13 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
           at_complete  acc-pairtype manyget large-small-acc lock_dt win_dynamic_acc fetch_and_op flush req_example rmanull rmazero badrma
           lock_nested winname attrorderwin baseattrwin fkeyvalwin strided_acc_indexed strided_getacc_indexed compare_and_swap
           lockall_dt lockall_dt_flushall lock_dt_flush lockall_dt_flush lockall_dt_flushlocalall lockall_dt_flushlocal  lock_dt_flushlocal 
-     strided_acc_onelock strided_get_indexed strided_putget_indexed contention_put contention_putget
+     strided_acc_onelock strided_get_indexed strided_putget_indexed contention_put contention_putget lockcontention3
      adlb_mimic1 lock_contention_dt acc-loc get_acc_local get_accumulate put_base put_bottom
      linked_list_bench_lock_all linked_list_bench_lock_excl manyrma2 pscw_ordering rma-contig get-struct
      rput_local_comp racc_local_comp rget-testall win_shared win_shared_put_flush_get)
     # fence_shm fetchandadd_am fetchandadd fetchandadd_tree_am fetchandadd_tree 
     #  linked_list_bench_lock_shr linked_list linked_list_fop linked_list_lockall 
-    #   mcs-mutex mixedsync mutex_bench lockcontention3 reqops
+    #   mcs-mutex mixedsync mutex_bench  reqops
     # strided_getacc_indexed_shared rget-unlock 
     # win_flavors win_shared_zerobyte win_shared_noncontig win_shared_noncontig_put 
     # win_large_shm win_zero wintest  atomic_rmw_fop atomic_rmw_gacc  atomic_get atomic_rmw_cas
diff --git a/teshsuite/smpi/mpich3-test/rma/lockcontention3.c b/teshsuite/smpi/mpich3-test/rma/lockcontention3.c
index 134f41240b..d1ae7f68b5 100644
--- 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) */
-        /* 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++) {
-            if (buf[j * stride] != PUT_VAL + j) {
+            if (buf[j * stride+OFFSET_1] != PUT_VAL + j) {
                 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) */
-        /* 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++) {
-            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,
-                       buf[j * stride], ACC_VAL + j + OFFSET_2 + j * stride);
+                       buf[j * stride+OFFSET_2], ACC_VAL + j + OFFSET_2 + j * stride);
             }
         }
         break;
diff --git a/teshsuite/smpi/mpich3-test/rma/testlist b/teshsuite/smpi/mpich3-test/rma/testlist
index d87cc3026a..0bd426af49 100644
--- a/teshsuite/smpi/mpich3-test/rma/testlist
+++ b/teshsuite/smpi/mpich3-test/rma/testlist
@@ -27,7 +27,7 @@ lockcontention 3
 lockcontention2 4
 lockcontention2 8
 #Buggy one.
-#lockcontention3 8
+lockcontention3 8
 lockopts 2
 lock_dt 2
 lock_dt_flush 2