diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py index b16887980..071fea86b 100755 --- a/tools/donate-cpu-server.py +++ b/tools/donate-cpu-server.py @@ -24,7 +24,7 @@ import html as html_lib # Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/ # Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic # changes) -SERVER_VERSION = "1.3.13" +SERVER_VERSION = "1.3.14" OLD_VERSION = '2.3' @@ -199,12 +199,12 @@ def crashReport(results_path: str) -> str: if not l.strip(): break # #0 0x00007ffff71cbf67 in raise () from /lib64/libc.so.6 - m = re.search(r'(?P#\d+) .* (?P.+)\(.*\) from (?P.*)$', l) + m = re.search(r'(?P#\d+) .* in (?P.+)\(.*\) from (?P.*)$', l) if m: stack_trace.append(m.group('number') + ' ' + m.group('function') + '(...) from ' + m.group('binary')) continue # #11 0x00000000006f2414 in valueFlowNumber (tokenlist=tokenlist@entry=0x7fffffffc610) at build/valueflow.cpp:2503 - m = re.search(r'(?P#\d+) .* (?P.+)\(.*\) at (?P.*)$', l) + m = re.search(r'(?P#\d+) .* in (?P.+)\(.*\) at (?P.*)$', l) if m: stack_trace.append(m.group('number') + ' ' + m.group('function') + '(...) at ' + m.group('location')) continue @@ -637,7 +637,7 @@ def timeReport(resultPath: str, show_gt: bool) -> str: html = '{}\n'.format(title) html += '

{}

\n'.format(title) html += '
\n'
-    column_width = [40, 10, 10, 10, 10]
+    column_width = [40, 10, 10, 10, 10, 10]
     html += ''
     html += fmt('Package', 'Date       Time', OLD_VERSION, 'Head', 'Factor', link=False, column_width=column_width)
     html += '\n'
@@ -710,6 +710,7 @@ def timeReport(resultPath: str, show_gt: bool) -> str:
         total_time_factor = 0.0
     html += 'Time for all packages (not just the ones listed above):\n'
     html += fmt('Total time:',
+            '',
             '{:.1f}'.format(total_time_base),
             '{:.1f}'.format(total_time_head),
             '{:.2f}'.format(total_time_factor), link=False, column_width=column_width)