Merge an initialization function into the constructor

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

diff --git a/teshsuite/smpi/MBI/ResleakGenerator.py b/teshsuite/smpi/MBI/ResleakGenerator.py
index d1d84ea..a9ff22f 100755 (executable)
--- a/teshsuite/smpi/MBI/ResleakGenerator.py
+++ b/teshsuite/smpi/MBI/ResleakGenerator.py
@@ -50,8 +50,8 @@ 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 size = 1;
+  int j = 0;
 
   MPI_Init(&argc, &argv);
   MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
@@ -95,7 +95,7 @@ for call in gen.tcoll:
     patterns['end'] = ''
 
     # Generate the correct code
-    replace = patterns
+    replace = patterns.copy()
     replace['shortdesc'] = '@{call}@ is correctly used'
     replace['longdesc'] = f'{call} correctly used'
     replace['outcome'] = 'OK'
@@ -103,7 +103,7 @@ for call in gen.tcoll:
     gen.make_file(template, f'ResLeak_{call}_ok.c', replace)
 
     # Generate the resleak
-    replace = patterns
+    replace = patterns.copy()
     replace['shortdesc'] = '@{call}@ has no free'
     replace['longdesc'] = '@{call}@ has no free'
     replace['outcome'] = f'ERROR: {gen.error[call]}'
@@ -112,13 +112,13 @@ for call in gen.tcoll:
     gen.make_file(template, f'ResLeak_{call}_nok.c', replace)
 
     # Generate multiple resleak
-    replace = patterns
+    replace = patterns.copy()
     replace['shortdesc'] = '@{call}@ lacks several free'
     replace['longdesc'] = '@{call}@ lacks several free'
     replace['outcome'] = f'ERROR: {gen.error[call]}'
     replace['errormsg'] = 'Resleak. @{call}@ at @{filename}@:@{line:MBIERROR}@ lacks several free.'
     replace['change_size'] = 'size=PARAM_PER_ITERATION;'
-    replace['loop'] = 'for (i = 0; i < ITERATIONS; i++) {\n    for (j = 0; j < PARAM_PER_ITERATION; j++) {'
+    replace['loop'] = 'for (int i = 0; i < ITERATIONS; i++) {\n    for (j = 0; j < PARAM_PER_ITERATION; j++) {'
     replace['cond'] = '      if (j < PARAM_PER_ITERATION - PARAM_LOST_PER_ITERATION) {'
     replace['fini'] = gen.fini[call]("1") + ' /* MBIERROR */'
     replace['end'] = '      }\n     }\n   }'