From 3ec77fc9366d2997f275b73cd0a738bce194d4f7 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 17 Mar 2014 07:41:08 +0000 Subject: [PATCH] improve regression test parsing --- tools/parse_test_results.py | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/tools/parse_test_results.py b/tools/parse_test_results.py index eddbb6ee5..22231bd4e 100755 --- a/tools/parse_test_results.py +++ b/tools/parse_test_results.py @@ -68,7 +68,9 @@ def style_output(logfile, outfile): ' : error LNK' in l or \ ': undefined reference to ' in l: print >>outfile, '%s' % l - elif ': warning: ' in l or ') : warning C' in l or \ + elif ': warning: ' in l or \ + ') : warning C' in l or \ + '0;1;35mwarning: ' in l or \ 'Uninitialised value was created by a' in l or \ 'bytes after a block of size' in l or \ 'bytes inside a block of size' in l: @@ -286,11 +288,23 @@ for branch_name in revs: ''' % (p, toolset, branch_name) print >>html, '%s' % (details_name, toolset) + deferred_end_table = False for f in features: title = f if len(tests[f]) < 10: title = '#' - print >>details_file, '' % title + if title != '#': + if deferred_end_table: + print >>details_file, '
%s
' + print >>details_file, '' % title + deferred_end_table = False + else: + print >>details_file, '
%s
' + print >>details_file, '' % title + elif not deferred_end_table: + print >>details_file, '
%s
' + print >>details_file, '' % title + for t in platforms[p][toolset][f]: details = platforms[p][toolset][f][t] exitcode = details['status'] @@ -308,7 +322,8 @@ for branch_name in revs: elif exitcode == -1073740777: error_state = 'timeout' c = 'timeout' - elif exitcode == 333: + elif exitcode == 333 or \ + exitcode == 77: error_code = 'test-failed' c = 'failed' else: @@ -319,6 +334,13 @@ for branch_name in revs: print >>html, '' % (t, f, c, log_name) print >>details_file, '' % (c, os.path.split(log_name)[1], t, error_state) save_log_file(log_name, project_name, branch_name, '%s - %s' % (t, f), int(details['timestamp']), details['output']) + if title != '#': + print >>details_file, '
%s
%s [%s]
' + deferred_end_table = False + else: + deferred_end_table = True + + if deferred_end_table: print >>details_file, '' print >>html, ''