X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd1018cf4004d465e9c334191671d70c775f8718..a46b20e2007bf3a1a675ea590511672f051d38da:/teshsuite/smpi/MBI/CollP2PMessageRaceGenerator.py

diff --git a/teshsuite/smpi/MBI/CollP2PMessageRaceGenerator.py b/teshsuite/smpi/MBI/CollP2PMessageRaceGenerator.py
index 6c45f48831..4ca22b9d0d 100755
--- a/teshsuite/smpi/MBI/CollP2PMessageRaceGenerator.py
+++ b/teshsuite/smpi/MBI/CollP2PMessageRaceGenerator.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python3
 import os
 import sys
-from generator_utils import *
+import generator_utils as gen
 
 template = """// @{generatedby}@
 /* ///////////////////////// The MPI Bugs Initiative ////////////////////////
@@ -59,7 +59,6 @@ int main(int argc, char **argv) {
   MPI_Op op = MPI_SUM;
 
 
-
   @{init1}@
   @{init2}@
   @{init3}@
@@ -82,6 +81,7 @@ int main(int argc, char **argv) {
     @{operation3}@ /* MBIERROR1 */
     @{operation1}@
     @{fini1}@
+    @{changesrc}@
     @{operation4}@ /* MBIERROR2 */
     @{fini3}@
     @{fini4}@
@@ -102,39 +102,50 @@ int main(int argc, char **argv) {
 """
 
 
-for s in send + isend:
-    for r in irecv:
-        for c in coll:
+for s in gen.send + gen.isend:
+    for r in gen.irecv:
+        for c in gen.coll:
             patterns = {}
             patterns = {'s': s, 'r': r, 'c': c}
             patterns['generatedby'] = f'DO NOT EDIT: this file was generated by {os.path.basename(sys.argv[0])}. DO NOT EDIT.'
-            patterns['p2pfeature'] = 'Yes' if s in send or r in recv else 'Lacking'
-            patterns['ip2pfeature'] = 'Yes' if s in isend or r in irecv else 'Lacking'
-            patterns['collfeature'] = 'Yes' if c in coll else 'Lacking'
+            patterns['p2pfeature'] = 'Yes' if s in gen.send or r in gen.recv else 'Lacking'
+            patterns['ip2pfeature'] = 'Yes' if s in gen.isend or r in gen.irecv else 'Lacking'
+            patterns['collfeature'] = 'Yes' if c in gen.coll else 'Lacking'
             patterns['s'] = s
             patterns['r'] = r
             patterns['c'] = c
-            patterns['init1'] = init[c]("1")
-            patterns['init2'] = init[s]("2")
-            patterns['init3'] = init[r]("3")
-            patterns['init4'] = init[r]("4")
-            patterns['fini1'] = fini[c]("1")
-            patterns['fini2'] = fini[s]("2")
-            patterns['fini3'] = fini[r]("3")
-            patterns['fini4'] = fini[r]("4")
-            patterns['free1'] = free[c]("1")
-            patterns['free2'] = free[s]("2")
-            patterns['free3'] = free[r]("3")
-            patterns['free4'] = free[r]("4")
-            patterns['operation1'] = operation[c]("1")
-            patterns['operation2'] = operation[s]("2")
-            patterns['operation3'] = operation[r]("3")
-            patterns['operation4'] = operation[r]("4")
+            patterns['init1'] = gen.init[c]("1")
+            patterns['init2'] = gen.init[s]("2")
+            patterns['init3'] = gen.init[r]("3")
+            patterns['init4'] = gen.init[r]("4")
+            patterns['fini1'] = gen.fini[c]("1")
+            patterns['fini2'] = gen.fini[s]("2")
+            patterns['fini3'] = gen.fini[r]("3")
+            patterns['fini4'] = gen.fini[r]("4")
+            patterns['free1'] = gen.free[c]("1")
+            patterns['free2'] = gen.free[s]("2")
+            patterns['free3'] = gen.free[r]("3")
+            patterns['free4'] = gen.free[r]("4")
+            patterns['operation1'] = gen.operation[c]("1")
+            patterns['operation2'] = gen.operation[s]("2")
+            patterns['operation3'] = gen.operation[r]("3")
+            patterns['operation4'] = gen.operation[r]("4")
+            patterns['changesrc'] = ''
+
+            # Generate the correct matching because of the conditional
+            replace = patterns.copy()
+            replace['shortdesc'] = 'Message race'
+            replace['longdesc'] = 'Message race without problem in @{r}@ with @{c}@.'
+            replace['outcome'] = 'OK'
+            replace['errormsg'] = 'OK'
+            replace['changesrc'] = ''
+            gen.make_file(template, f'MessageRace_{c}_{s}_{r}_ok.c', replace)
 
             # Generate the incorrect matching because of the conditional
-            replace = patterns
+            replace = patterns.copy()
             replace['shortdesc'] = 'Message race'
             replace['longdesc'] = 'Message race in @{r}@ with @{c}@.'
             replace['outcome'] = 'ERROR: MessageRace'
             replace['errormsg'] = 'Message race. The use of wildcard receive calls (@{r}@ at @{filename}@:@{line:MBIERROR1}@ and @{r}@ at @{filename}@:@{line:MBIERROR2}@) leads to nondeterministic matching.'
-            make_file(template, f'MessageRace_{c}_{s}_{r}_nok.c', replace)
+            replace['changesrc'] = 'src = 0;'
+            gen.make_file(template, f'MessageRace_{c}_{s}_{r}_nok.c', replace)