From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Tue, 4 Oct 2022 22:35:41 +0000 (+0200)
Subject: Let the latest MBI tests compile with our paranoid compil flags
X-Git-Tag: v3.34~800
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c7f399a68dcf89f6c5fa095f5ab05ea72988ccf8

Let the latest MBI tests compile with our paranoid compil flags
---

diff --git a/teshsuite/smpi/MBI/CMakeLists.txt b/teshsuite/smpi/MBI/CMakeLists.txt
index 06cec65c1e..dbd755821e 100644
--- a/teshsuite/smpi/MBI/CMakeLists.txt
+++ b/teshsuite/smpi/MBI/CMakeLists.txt
@@ -13,19 +13,24 @@ set(generator_scripts
     CollP2PMatchingGenerator.py
     CollP2PMessageRaceGenerator.py
     CollTopoGenerator.py
+    InputHazardGenerator.py
     MissingWaitandStartGenerator.py
     P2PArgGenerator.py
+    P2PBufferingGenerator.py
     P2PComGenerator.py
     P2PInvalidComGenerator.py
     P2PLocalConcurrencyGenerator.py
     P2PMatchingANYSRCGenerator.py
     P2PMatchingGenerator.py
+    P2PMessageRaceGenerator.py
+    P2PMessageRaceTagsGenerator.py
     P2PProbeGenerator.py
     ResleakGenerator.py
     RMAArgGenerator.py
     RMAInvalidArgGenerator.py
     RMALocalLocalConcurrencyGenerator.py
     RMAP2PGlobalConcurrencyGenerator.py
+    RMAP2PLocalConcurrencyGenerator.py
     RMARemoteLocalConcurrencyGenerator.py
     RMARemoteRemoteConcurrencyGenerator.py
     RMAReqLifecycleGenerator.py
@@ -106,10 +111,10 @@ if (enable_smpi_MBI_testsuite)
           GlobalConcurrency_Get_Isend_Irecv_nok GlobalConcurrency_Get_Isend_Recv_nok GlobalConcurrency_Get_Send_Irecv_nok GlobalConcurrency_Get_Send_Recv_nok
           GlobalConcurrency_Put_Isend_Irecv_nok GlobalConcurrency_Put_Isend_Recv_nok GlobalConcurrency_Put_Send_Irecv_nok GlobalConcurrency_Put_Send_Recv_nok
 
-          GlobalConcurrency_rl_Win_fence_Get_rload_nok     GlobalConcurrency_rl_Win_fence_Get_rstore_nok
-          GlobalConcurrency_rl_Win_fence_Put_rload_nok     GlobalConcurrency_rl_Win_fence_Put_rstore_nok
-          GlobalConcurrency_rl_Win_lock_all_Get_rload_nok  GlobalConcurrency_rl_Win_lock_all_Get_rstore_nok
-          GlobalConcurrency_rl_Win_lock_all_Put_rload_nok  GlobalConcurrency_rl_Win_lock_all_Put_rstore_nok
+#          GlobalConcurrency_rl_Win_fence_Get_rload_nok     GlobalConcurrency_rl_Win_fence_Get_rstore_nok
+#          GlobalConcurrency_rl_Win_fence_Put_rload_nok     GlobalConcurrency_rl_Win_fence_Put_rstore_nok
+#          GlobalConcurrency_rl_Win_lock_all_Get_rload_nok  GlobalConcurrency_rl_Win_lock_all_Get_rstore_nok
+#          GlobalConcurrency_rl_Win_lock_all_Put_rload_nok  GlobalConcurrency_rl_Win_lock_all_Put_rstore_nok
        )
     set_tests_properties(mbi-${localmodif} PROPERTIES WILL_FAIL true)
   endforeach(localmodif )
diff --git a/teshsuite/smpi/MBI/CollArgGenerator.py b/teshsuite/smpi/MBI/CollArgGenerator.py
index 17afc845ed..e269309bdf 100755
--- a/teshsuite/smpi/MBI/CollArgGenerator.py
+++ b/teshsuite/smpi/MBI/CollArgGenerator.py
@@ -41,7 +41,8 @@ int main(int argc, char **argv) {
   int nprocs = -1;
   int rank = -1;
   int root = 0;
-  int size = 1, j=0, color=0;
+  int size = 1;
+  int j=0;
 
   MPI_Init(&argc, &argv);
   MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
diff --git a/teshsuite/smpi/MBI/InputHazardGenerator.py b/teshsuite/smpi/MBI/InputHazardGenerator.py
index ccff63cf81..899e810f96 100755
--- a/teshsuite/smpi/MBI/InputHazardGenerator.py
+++ b/teshsuite/smpi/MBI/InputHazardGenerator.py
@@ -44,10 +44,10 @@ int main(int argc, char **argv) {
   int nprocs = -1;
   int rank = -1;
   MPI_Status sta;
-  int src,dest;
   int i=0;
   int root = 0;
-  int stag=0, rtag=0;
+  int stag=0;
+  int rtag=0;
   int buff_size = N;
 
   MPI_Init(&argc, &argv);
@@ -73,7 +73,6 @@ int main(int argc, char **argv) {
   @{init2}@
 
   if (rank == 0) {
-    dest=1, src=1;
     if ((n % 2) == 0) { @{errorcond}@
       @{operation1b}@
       @{fini1b}@
@@ -82,7 +81,6 @@ int main(int argc, char **argv) {
       @{fini1a}@
     }
   } else @{addcond}@ {
-    dest=0, src=0;
     @{operation2}@
     @{fini2}@
   }
@@ -111,14 +109,14 @@ for s in gen.send + gen.isend:
         patterns['r'] = r
 
         patterns['init1'] = gen.init[s]("1")
-        patterns['operation1a'] = gen.operation[s]("1").replace("buf1", "buffer")
-        patterns['operation1b'] = gen.operation[s]("1").replace("buf1", "buffer")
+        patterns['operation1a'] = gen.operation[s]("1").replace("buf1", "buffer").replace("dest", "1")
+        patterns['operation1b'] = gen.operation[s]("1").replace("buf1", "buffer").replace("dest", "1")
         patterns['fini1a'] = gen.fini[s]("1")
         patterns['fini1b'] = gen.fini[s]("1")
         patterns['free1'] = gen.free[s]("1")
 
         patterns['init2'] = gen.init[r]("2")
-        patterns['operation2'] = gen.operation[r]("2").replace("buf2", "buffer")
+        patterns['operation2'] = gen.operation[r]("2").replace("buf2", "buffer").replace("src", "0")
         patterns['fini2'] = gen.fini[r]("2")
         patterns['free2'] = gen.free[r]("2")
 
diff --git a/teshsuite/smpi/MBI/ResleakGenerator.py b/teshsuite/smpi/MBI/ResleakGenerator.py
index 5cec249855..c33d1978fb 100755
--- a/teshsuite/smpi/MBI/ResleakGenerator.py
+++ b/teshsuite/smpi/MBI/ResleakGenerator.py
@@ -50,8 +50,9 @@ static void myOp(int *invec, int *inoutvec, int *len, MPI_Datatype *dtype) {
 int main(int argc, char **argv) {
   int nprocs = -1;
   int rank = -1;
-  int i=1, j=0, size=1;
-  int color =0;
+  int i=1;
+  int j=0;
+  int size=1;
 
   MPI_Init(&argc, &argv);
   MPI_Comm_size(MPI_COMM_WORLD, &nprocs);