From db3284e3ddce24b99528ab3d4c6b4e8ce45cd03b Mon Sep 17 00:00:00 2001
From: Sebastian <versat@users.noreply.github.com>
Date: Mon, 1 Jul 2019 14:55:38 +0200
Subject: [PATCH] donate-cpu-server.py: Fix #9192: Old results are shown in the
 reports (#1941)

Trac ticket: https://trac.cppcheck.net/ticket/9192
This commit also fixes that negative values of the elapsed time are
used for calculating total times. These crashes and errors are now
ignored in the time report since there is no useful timing information
in that case.

Tested with a local daca@home server with old and new results.
---
 tools/donate-cpu-server.py | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py
index 1c9e0bcac..c8d9af1f7 100644
--- a/tools/donate-cpu-server.py
+++ b/tools/donate-cpu-server.py
@@ -18,7 +18,7 @@ import operator
 # 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.1.2"
+SERVER_VERSION = "1.1.3"
 
 OLD_VERSION = '1.88'
 
@@ -150,6 +150,13 @@ def crashReport():
         datestr = ''
         for line in open(filename, 'rt'):
             line = line.strip()
+            if line.startswith('cppcheck: '):
+                if OLD_VERSION not in line:
+                    # Package results seem to be too old, skip
+                    break
+                else:
+                    # Current package, parse on
+                    continue
             if line.startswith(str(current_year) + '-') or line.startswith(str(current_year - 1) + '-'):
                 datestr = line
             if not line.startswith('count:'):
@@ -419,6 +426,13 @@ def headReport(resultsPath):
                 firstLine = False
                 continue
             line = line.strip()
+            if line.startswith('cppcheck: '):
+                if OLD_VERSION not in line:
+                    # Package results seem to be too old, skip
+                    break
+                else:
+                    # Current package, parse on
+                    continue
             if line.startswith('head results:'):
                 headResults = True
                 continue
@@ -532,11 +546,21 @@ def timeReport(resultPath):
         if not os.path.isfile(filename):
             continue
         for line in open(filename, 'rt'):
+            if line.startswith('cppcheck: '):
+                if OLD_VERSION not in line:
+                    # Package results seem to be too old, skip
+                    break
+                else:
+                    # Current package, parse on
+                    continue
             if not line.startswith('elapsed-time:'):
                 continue
             split_line = line.strip().split()
             time_base = float(split_line[2])
             time_head = float(split_line[1])
+            if time_base < 0.0 or time_head < 0.0:
+                # ignore results with crashes / errors for the time report
+                break
             total_time_base += time_base
             total_time_head += time_head
             suspicious_time_difference = False
@@ -596,6 +620,13 @@ def check_library_report(result_path, message_id):
             continue
         info_messages = False
         for line in open(filename, 'rt'):
+            if line.startswith('cppcheck: '):
+                if OLD_VERSION not in line:
+                    # Package results seem to be too old, skip
+                    break
+                else:
+                    # Current package, parse on
+                    continue
             if line == 'info messages:\n':
                 info_messages = True
             if not info_messages: