X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/97e2219ed6c0e511f6165460cec79afadf42f589..3c7c64745aa5e60415bb85af482c7b0d0fca2b2b:/teshsuite/smpi/MBI/MissingWaitandStartGenerator.py diff --git a/teshsuite/smpi/MBI/MissingWaitandStartGenerator.py b/teshsuite/smpi/MBI/MissingWaitandStartGenerator.py index 54d4384bba..e169bdf697 100755 --- a/teshsuite/smpi/MBI/MissingWaitandStartGenerator.py +++ b/teshsuite/smpi/MBI/MissingWaitandStartGenerator.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 //////////////////////// @@ -81,84 +81,84 @@ int main(int argc, char **argv) { """ -for s in isend + psend: - for r in irecv + precv: +for s in gen.isend + gen.psend: + for r in gen.irecv + gen.precv: patterns = {} patterns = {'s': s, 'r': r} patterns['generatedby'] = f'DO NOT EDIT: this file was generated by {os.path.basename(sys.argv[0])}. DO NOT EDIT.' - patterns['persfeature'] = 'Yes' if s in psend or r in precv else 'Lacking' - patterns['ip2pfeature'] = 'Yes' if s in isend or r in irecv else 'Lacking' + patterns['persfeature'] = 'Yes' if s in gen.psend or r in gen.precv else 'Lacking' + patterns['ip2pfeature'] = 'Yes' if s in gen.isend or r in gen.irecv else 'Lacking' patterns['icollfeature'] = 'Lacking' patterns['cpersfeature'] = 'Lacking' patterns['s'] = s patterns['r'] = r - patterns['init1'] = init[s]("1") - patterns['init2'] = init[r]("2") - patterns['start1'] = start[s]("1") + patterns['init1'] = gen.init[s]("1") + patterns['init2'] = gen.init[r]("2") + patterns['start1'] = gen.start[s]("1") startPers = patterns['start1'] - patterns['start2'] = start[r]("2") - patterns['operation1'] = operation[s]("1") - patterns['operation2'] = operation[r]("2") - patterns['fini1'] = fini[s]("1") + patterns['start2'] = gen.start[r]("2") + patterns['operation1'] = gen.operation[s]("1") + patterns['operation2'] = gen.operation[r]("2") + patterns['fini1'] = gen.fini[s]("1") wait = patterns['fini1'] - patterns['fini2'] = fini[r]("2") - patterns['free1'] = free[s]("1") + patterns['fini2'] = gen.fini[r]("2") + patterns['free1'] = gen.free[s]("1") Reqfree = patterns['free1'] - patterns['free2'] = free[r]("2") + patterns['free2'] = gen.free[r]("2") # Generate the correct code - replace = patterns + replace = patterns.copy() replace['shortdesc'] = 'Correct matching' - replace['longdesc'] = f'No error' + replace['longdesc'] = 'No error' replace['outcome'] = 'OK' replace['errormsg'] = 'OK' - make_file(template, f'ReqLifecycle_{s}_{r}_ok.c', replace) + gen.make_file(template, f'ReqLifecycle_{s}_{r}_ok.c', replace) # Generate the code with a missing wait - replace = patterns + replace = patterns.copy() replace['shortdesc'] = 'Missing wait' replace['longdesc'] = 'Missing Wait. @{s}@ at @{filename}@:@{line:MBIERROR}@ has no completion.' replace['outcome'] = 'ERROR: MissingWait' replace['errormsg'] = 'ERROR: MissingWait' - replace['fini1'] = ' /* MBIERROR MISSING: ' + wait + ' */' - make_file(template, f'ReqLifecycle_MissingWait_{s}_{r}_nok.c', replace) + replace['fini1'] = ' /* MBIERROR MISSING: ' + wait + ' */' + gen.make_file(template, f'ReqLifecycle_MissingWait_{s}_{r}_nok.c', replace) - if s in psend: + if s in gen.psend: # Generate the code with a missing start - persistent only - replace = patterns + replace = patterns.copy() replace['shortdesc'] = 'Missing start' replace['longdesc'] = 'Missing start. @{s}@ at @{filename}@:@{line:MBIERROR}@ has no start' replace['outcome'] = 'ERROR: MissingStart' replace['errormsg'] = 'ERROR: MissingStart' - replace['fini1'] = fini[s]("1") + replace['fini1'] = gen.fini[s]("1") replace['start1'] = ' /* MBIERROR MISSING: ' + startPers + ' */' - make_file(template, f'ReqLifecycle_MissingStart_{s}_{r}_nok.c', replace) + gen.make_file(template, f'ReqLifecycle_MissingStart_{s}_{r}_nok.c', replace) # Generate the code with a missing free - persistent only - replace = patterns + replace = patterns.copy() replace['shortdesc'] = 'Missing free' replace['longdesc'] = 'Missing free. @{s}@ at @{filename}@:@{line:MBIERROR}@ has no free' replace['outcome'] = 'ERROR: RequestLeak' replace['errormsg'] = 'ERROR: RequestLeak' - replace['start1'] = start[s]("1") + replace['start1'] = gen.start[s]("1") replace['free1'] = ' /* MBIERROR MISSING: ' + Reqfree + ' */' - make_file(template, f'ResLeak_nofree_{s}_{r}_nok.c', replace) + gen.make_file(template, f'ResLeak_nofree_{s}_{r}_nok.c', replace) # Collectives only -for c in pcoll + icoll + ibarrier: +for c in gen.pcoll + gen.icoll + gen.ibarrier: patterns = {} patterns = {'c': c} patterns['generatedby'] = f'DO NOT EDIT: this file was generated by {os.path.basename(sys.argv[0])}. DO NOT EDIT.' patterns['persfeature'] = 'Lacking' patterns['ip2pfeature'] = 'Lacking' - patterns['cpersfeature'] = 'Yes' if c in pcoll else 'Lacking' - patterns['icollfeature'] = 'Yes' if c in icoll + ibarrier else 'Lacking' + patterns['cpersfeature'] = 'Yes' if c in gen.pcoll else 'Lacking' + patterns['icollfeature'] = 'Yes' if c in gen.icoll + gen.ibarrier else 'Lacking' patterns['c'] = c - patterns['init1'] = init[c]("1") - patterns['operation1'] = operation[c]("1") - patterns['start1'] = start[c]("1") - patterns['fini1'] = fini[c]("1") - patterns['free1'] = free[c]("1") + patterns['init1'] = gen.init[c]("1") + patterns['operation1'] = gen.operation[c]("1") + patterns['start1'] = gen.start[c]("1") + patterns['fini1'] = gen.fini[c]("1") + patterns['free1'] = gen.free[c]("1") opstart = patterns['start1'] opwait = patterns['fini1'] opfree = patterns['free1'] @@ -169,32 +169,32 @@ for c in pcoll + icoll + ibarrier: patterns['free2'] = "" # Generate the code with a missing wait - replace = patterns + replace = patterns.copy() replace['shortdesc'] = 'Missing wait' replace['longdesc'] = 'Missing Wait. @{c}@ at @{filename}@:@{line:MBIERROR}@ has no completion' replace['outcome'] = 'ERROR: MissingWait' replace['errormsg'] = 'ERROR: MissingWait' replace['fini1'] = ' /* MBIERROR MISSING: ' + opwait + ' */' replace['free1'] = ' /* MISSING: ' + replace['free1'] + ' (to not free the buffer before an internal wait */' - make_file(template, f'ReqLifecycle_MissingWait_{c}_nok.c', replace) + gen.make_file(template, f'ReqLifecycle_MissingWait_{c}_nok.c', replace) - if c in pcoll: + if c in gen.pcoll: # Generate the code with a missing start - persistent only - replace = patterns + replace = patterns.copy() replace['shortdesc'] = 'Missing start functio' replace['longdesc'] = 'Missing Start. @{c}@ at @{filename}@:@{line:MBIERROR}@ has no start' replace['outcome'] = 'ERROR: MissingStart' replace['errormsg'] = 'ERROR: MissingStart' - replace['fini1'] = fini[c]("1") + replace['fini1'] = gen.fini[c]("1") replace['start1'] = ' /* MBIERROR MISSING: ' + opstart + ' */' - make_file(template, f'ReqLifecycle_MissingStart_{c}_nok.c', replace) + gen.make_file(template, f'ReqLifecycle_MissingStart_{c}_nok.c', replace) # Generate the code with a resleak (no free) - persistent only - replace = patterns + replace = patterns.copy() replace['shortdesc'] = 'Missing free' replace['longdesc'] = 'Missing free. @{c}@ at @{filename}@:@{line:MBIERROR}@ has no free' replace['outcome'] = 'ERROR: RequestLeak' replace['errormsg'] = 'ERROR: RequestLeak' - replace['start1'] = start[c]("1") + replace['start1'] = gen.start[c]("1") replace['free1'] = ' /* MBIERROR MISSING: ' + opfree + ' */' - make_file(template, f'ResLeak_nofree_{c}_nok.c', replace) + gen.make_file(template, f'ResLeak_nofree_{c}_nok.c', replace)