Commit 2a98c1f8 authored by Andrey Kamaev's avatar Andrey Kamaev Committed by OpenCV Buildbot

Merge pull request #446 from AnnaKogan8:updated-perf-timing-script

parents 716e0192 51e58aeb
...@@ -15,115 +15,145 @@ if __name__ == "__main__": ...@@ -15,115 +15,145 @@ if __name__ == "__main__":
help = "output results in text format (can be 'txt', 'html' or 'auto' - default)", help = "output results in text format (can be 'txt', 'html' or 'auto' - default)",
metavar = 'FMT', default = 'auto') metavar = 'FMT', default = 'auto')
parser.add_option("--failed-only", action = "store_true", dest = "failedOnly",
help = "print only failed tests", default = False)
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if 1 != len(args):
parser.print_help()
exit(0)
options.generateHtml = detectHtmlOutputType(options.format) options.generateHtml = detectHtmlOutputType(options.format)
input_file = args[0] files = []
file = os.path.abspath(input_file) testsuits = [] # testsuit module, name, time, num, flag for failed tests
if not os.path.isfile(file):
sys.stderr.write("IOError reading \"" + file + "\" - " + str(err) + os.linesep)
parser.print_help()
exit(0)
test_sets = []
try:
tests = testlog_parser.parseLogFile(file)
if tests:
test_sets.append((os.path.basename(file), tests))
except IOError as err:
sys.stderr.write("IOError reading \"" + file + "\" - " + str(err) + os.linesep)
except xml.parsers.expat.ExpatError as err:
sys.stderr.write("ExpatError reading \"" + file + "\" - " + str(err) + os.linesep)
if not test_sets:
sys.stderr.write("Error: no test data found" + os.linesep)
exit(0)
# find matches
setsCount = len(test_sets)
test_cases = {}
name_extractor = lambda name: str(name)
for i in range(setsCount):
for case in test_sets[i][1]:
name = name_extractor(case)
if name not in test_cases:
test_cases[name] = [None] * setsCount
test_cases[name][i] = case
testsuits = [] # testsuit name, time, num, flag for failed tests
overall_time = 0 overall_time = 0
prevGroupName = None
suit_time = 0 seen = set()
suit_num = 0 for arg in args:
fails_num = 0 if ("*" in arg) or ("?" in arg):
for name in sorted(test_cases.iterkeys(), key=alphanum_keyselector): flist = [os.path.abspath(f) for f in glob.glob(arg)]
cases = test_cases[name] flist = sorted(flist, key= lambda text: str(text).replace("M", "_"))
files.extend([ x for x in flist if x not in seen and not seen.add(x)])
groupName = next(c for c in cases if c).shortName() else:
if groupName != prevGroupName: fname = os.path.abspath(arg)
if prevGroupName != None: if fname not in seen and not seen.add(fname):
suit_time = suit_time/60 #from seconds to minutes files.append(fname)
testsuits.append({'name': prevGroupName, 'time': suit_time, \
'num': suit_num, 'failed': fails_num}) file = os.path.abspath(fname)
overall_time += suit_time if not os.path.isfile(file):
suit_time = 0 sys.stderr.write("IOError reading \"" + file + "\" - " + str(err) + os.linesep)
suit_num = 0 parser.print_help()
fails_num = 0 exit(0)
prevGroupName = groupName
fname = os.path.basename(fname)
for i in range(setsCount): find_module_name = re.search(r'([^_]*)', fname)
case = cases[i] module_name = find_module_name.group(0)
if not case is None:
suit_num += 1 test_sets = []
if case.get('status') == 'run': try:
suit_time += case.get('time') tests = testlog_parser.parseLogFile(file)
if case.get('status') == 'failed': if tests:
fails_num += 1 test_sets.append((os.path.basename(file), tests))
except IOError as err:
testsuits.append({'name': prevGroupName, 'time': suit_time, \ sys.stderr.write("IOError reading \"" + file + "\" - " + str(err) + os.linesep)
'num': suit_num, 'failed': fails_num}) except xml.parsers.expat.ExpatError as err:
sys.stderr.write("ExpatError reading \"" + file + "\" - " + str(err) + os.linesep)
if not test_sets:
continue
# find matches
setsCount = len(test_sets)
test_cases = {}
name_extractor = lambda name: str(name)
for i in range(setsCount):
for case in test_sets[i][1]:
name = name_extractor(case)
if name not in test_cases:
test_cases[name] = [None] * setsCount
test_cases[name][i] = case
prevGroupName = None
suit_time = 0
suit_num = 0
fails_num = 0
for name in sorted(test_cases.iterkeys(), key=alphanum_keyselector):
cases = test_cases[name]
groupName = next(c for c in cases if c).shortName()
if groupName != prevGroupName:
if prevGroupName != None:
suit_time = suit_time/60 #from seconds to minutes
testsuits.append({'module': module_name, 'name': prevGroupName, \
'time': suit_time, 'num': suit_num, 'failed': fails_num})
overall_time += suit_time
suit_time = 0
suit_num = 0
fails_num = 0
prevGroupName = groupName
for i in range(setsCount):
case = cases[i]
if not case is None:
suit_num += 1
if case.get('status') == 'run':
suit_time += case.get('time')
if case.get('status') == 'failed':
fails_num += 1
# last testsuit processing
suit_time = suit_time/60
testsuits.append({'module': module_name, 'name': prevGroupName, \
'time': suit_time, 'num': suit_num, 'failed': fails_num})
overall_time += suit_time
if len(testsuits)==0: if len(testsuits)==0:
print 'No testsuits found'
exit(0) exit(0)
tbl = table() tbl = table()
rows = 0
if not options.failedOnly:
tbl.newColumn('module', 'Module', align = 'left', cssclass = 'col_name')
tbl.newColumn('name', 'Testsuit', align = 'left', cssclass = 'col_name')
tbl.newColumn('time', 'Time (min)', align = 'center', cssclass = 'col_name')
tbl.newColumn('num', 'Num of tests', align = 'center', cssclass = 'col_name')
tbl.newColumn('failed', 'Failed', align = 'center', cssclass = 'col_name')
# rows
for suit in sorted(testsuits, key = lambda suit: suit['time'], reverse = True):
tbl.newRow()
tbl.newCell('module', suit['module'])
tbl.newCell('name', suit['name'])
tbl.newCell('time', formatValue(suit['time'], '', ''), suit['time'])
tbl.newCell('num', suit['num'])
if (suit['failed'] != 0):
tbl.newCell('failed', suit['failed'])
else:
tbl.newCell('failed', ' ')
rows += 1
# header else:
tbl.newColumn('name', 'Testsuit', align = 'left', cssclass = 'col_name') tbl.newColumn('module', 'Module', align = 'left', cssclass = 'col_name')
tbl.newColumn('time', 'Time (min)', align = 'center', cssclass = 'col_name') tbl.newColumn('name', 'Testsuit', align = 'left', cssclass = 'col_name')
tbl.newColumn('num', 'Num of tests', align = 'center', cssclass = 'col_name') tbl.newColumn('failed', 'Failed', align = 'center', cssclass = 'col_name')
tbl.newColumn('failed', 'Failed', align = 'center', cssclass = 'col_name')
# rows
# rows for suit in sorted(testsuits, key = lambda suit: suit['time'], reverse = True):
for suit in sorted(testsuits, key = lambda suit: suit['time'], reverse = True): if (suit['failed'] != 0):
tbl.newRow() tbl.newRow()
tbl.newCell('name', suit['name']) tbl.newCell('module', suit['module'])
tbl.newCell('time', formatValue(suit['time'], '', ''), suit['time']) tbl.newCell('name', suit['name'])
tbl.newCell('num', suit['num']) tbl.newCell('failed', suit['failed'])
if (suit['failed'] != 0): rows += 1
tbl.newCell('failed', suit['failed'])
else:
tbl.newCell('failed', ' ')
# output table # output table
if options.generateHtml: if rows:
tbl.htmlPrintTable(sys.stdout) if options.generateHtml:
htmlPrintFooter(sys.stdout) tbl.htmlPrintTable(sys.stdout)
else: htmlPrintFooter(sys.stdout)
input_file = re.sub(r'^[\.\/]*', '', input_file) else:
find_module_name = re.search(r'([^_]*)', input_file) if not options.failedOnly:
module_name = find_module_name.group(0) print '\nOverall time: %.2f min\n' % overall_time
tbl.consolePrintTable(sys.stdout)
splitter = 15 * '*' print 2 * '\n'
print '\n%s\n %s\n%s\n' % (splitter, module_name, splitter) \ No newline at end of file
print 'Overall time: %.2f min\n' % overall_time
tbl.consolePrintTable(sys.stdout)
print 4 * '\n'
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment