Cosmetics in cmake

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

diff --git a/teshsuite/smpi/MBI/simgrid.py b/teshsuite/smpi/MBI/simgrid.py
index 947bcce0699b8da00e9537b1ae7dae6fa0f03174..3c1ca885074727466e04ebb7c73ed7b64ce8b628 100644 (file)
--- a/teshsuite/smpi/MBI/simgrid.py
+++ b/teshsuite/smpi/MBI/simgrid.py
@@ -31,7 +31,7 @@ class Tool(mbi.AbstractTool):
         os.chdir(here)
 
 
-    def ensure_image(self):
+    def ensure_image(self, params=None, dockerparams=None):
         mbi.AbstractTool.ensure_image(self, "-x simgrid")
 
     def setup(self, rootdir):
@@ -49,7 +49,7 @@ class Tool(mbi.AbstractTool):
                 outfile.write(' <cluster id="acme" prefix="node-" radical="0-99" suffix="" speed="1Gf" bw="125MBps" lat="50us"/>\n')
                 outfile.write('</platform>\n')
 
-        execcmd = execcmd.replace("mpirun", "smpirun -wrapper simgrid-mc -platform ./cluster.xml -analyze --cfg=smpi/finalization-barrier:on --cfg=smpi/list-leaks:10 --cfg=model-check/max-depth:10000")
+        execcmd = execcmd.replace("mpirun", "smpirun -wrapper simgrid-mc -platform ./cluster.xml -analyze --cfg=smpi/barrier-finalization:on --cfg=smpi/list-leaks:10 --cfg=model-check/max-depth:10000")
         execcmd = execcmd.replace('${EXE}', binary)
         execcmd = execcmd.replace('$zero_buffer', "--cfg=smpi/buffering:zero")
         execcmd = execcmd.replace('$infty_buffer', "--cfg=smpi/buffering:infty")
@@ -64,7 +64,7 @@ class Tool(mbi.AbstractTool):
             batchinfo=batchinfo)
 
     def teardown(self):
-        subprocess.run("find -type f -a -executable | xargs rm -f", shell=True, check=True) # Remove generated cruft (binary files)
+        subprocess.run("find -type f -a -executable -exec rm -f {} +", shell=True, check=True) # Remove generated cruft (binary files)
         subprocess.run("rm -f smpitmp-* core", shell=True, check=True)
 
     def parse(self, cachefile):
@@ -76,7 +76,7 @@ class Tool(mbi.AbstractTool):
         with open(f'{cachefile}.txt' if os.path.exists(f'{cachefile}.txt') else f'logs/simgrid/{cachefile}.txt', 'r') as infile:
             output = infile.read()
 
-        if re.search('Compilation of .*? raised an error \(retcode: ', output):
+        if re.search(r'Compilation of .*? raised an error \(retcode: ', output):
             return 'UNIMPLEMENTED'
 
         if re.search('MBI_MSG_RACE', output):