Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / teshsuite / smpi / MBI / RMARemoteRemoteConcurrencyGenerator.py

diff --git a/teshsuite/smpi/MBI/RMARemoteRemoteConcurrencyGenerator.py b/teshsuite/smpi/MBI/RMARemoteRemoteConcurrencyGenerator.py
index 10e421c..7a9f77a 100755 (executable)
--- a/teshsuite/smpi/MBI/RMARemoteRemoteConcurrencyGenerator.py
+++ b/teshsuite/smpi/MBI/RMARemoteRemoteConcurrencyGenerator.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 ////////////////////////
@@ -74,24 +74,23 @@ int main(int argc, char **argv) {
 """
 
 
-for e in epoch:
-    for p1 in get + put:
+for e in gen.epoch:
+    for p1 in gen.get + gen.put:
         patterns = {}
         patterns = {'e': e, 'p1': p1}
         patterns['generatedby'] = f'DO NOT EDIT: this file was generated by {os.path.basename(sys.argv[0])}. DO NOT EDIT.'
         patterns['rmafeature'] = 'Yes'
         patterns['p1'] = p1
         patterns['e'] = e
-        patterns['epoch'] = epoch[e]("1")
-        patterns['finEpoch'] = finEpoch[e]("1")
-        patterns['init1'] = init[p1]("1")
-        patterns['operation1'] = operation[p1]("1")
+        patterns['epoch'] = gen.epoch[e]("1")
+        patterns['finEpoch'] = gen.finEpoch[e]("1")
+        patterns['init1'] = gen.init[p1]("1")
+        patterns['operation1'] = gen.operation[p1]("1")
 
         # Generate a data race (Get + Get/load/store/Put)
-        replace = patterns
+        replace = patterns.copy()
         replace['shortdesc'] = 'Global Concurrency error.'
         replace['longdesc'] = 'Global Concurrency error. Both processes 0 and 2 access the window in process 1 with @{p1}@'
         replace['outcome'] = 'ERROR: GlobalConcurrency'
         replace['errormsg'] = 'Global Concurrency error. @{p1}@ at @{filename}@:@{line:MBIERROR1}@ conflicts in process 1'
-        make_file(template, f'GlobalConcurrency_rr_{e}_{p1}_nok.c', replace)
-
+        gen.make_file(template, f'GlobalConcurrency_rr_{e}_{p1}_nok.c', replace)