From 441d50df25deb1c1326b5c2f01c8d26c9ff55b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sun, 14 Oct 2018 16:31:13 +0200 Subject: [PATCH] donate-cpu: use 1.85 as base version --- tools/donate-cpu-server.py | 12 ++++++------ tools/donate-cpu.py | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py index 0dcaa4a14..bbf85f2c3 100644 --- a/tools/donate-cpu-server.py +++ b/tools/donate-cpu-server.py @@ -51,7 +51,7 @@ def fmt(a,b,c,d,e): def latestReport(latestResults): html = 'Latest daca@home results\n' html += '

Latest daca@home results

' - html += '
\n' + fmt('Package','Date       Time ','1.84','Head','Diff') + '\n'
+    html += '
\n' + fmt('Package','Date       Time ','1.85','Head','Diff') + '\n'
 
     # Write report for latest results
     for filename in latestResults:
@@ -71,7 +71,7 @@ def latestReport(latestResults):
                 count = line.split(' ')[1:]
             elif line.startswith('head '):
                 added += 1
-            elif line.startswith('1.84 '):
+            elif line.startswith('1.85 '):
                 lost += 1
         diff = ''
         if lost > 0:
@@ -88,7 +88,7 @@ def crashReport():
     html = 'Crash report\n'
     html += '
Crash report
\n'
     html += '
\n'
-    html += 'Package                                 1.84  Head\n'
+    html += 'Package                                 1.85  Head\n'
     for filename in sorted(glob.glob(os.path.expanduser('~/daca@home/donated-results/*'))):
         if not os.path.isfile(filename):
             continue
@@ -118,7 +118,7 @@ def crashReport():
 
 def diffReportFromDict(out, today):
     html = '
\n'
-    html += 'MessageID                           1.84    Head\n'
+    html += 'MessageID                           1.85    Head\n'
     sum0 = 0
     sum1 = 0
     for messageId in sorted(out.keys()):
@@ -174,7 +174,7 @@ def diffReport(resultsPath):
             if not line.endswith(']'):
                 continue
             index = None
-            if line.startswith('1.84 '):
+            if line.startswith('1.85 '):
                 index = 0
             elif line.startswith('head '):
                 index = 1
@@ -250,7 +250,7 @@ def diffMessageIdTodayReport(resultPath, messageId):
 
 def timeReport(resultPath):
     text = 'Time report\n\n'
-    text += 'Package 1.84 Head\n'
+    text += 'Package 1.85 Head\n'
 
     totalTime184 = 0.0
     totalTimeHead = 0.0
diff --git a/tools/donate-cpu.py b/tools/donate-cpu.py
index aaed694ef..39db1dee4 100644
--- a/tools/donate-cpu.py
+++ b/tools/donate-cpu.py
@@ -288,8 +288,8 @@ while True:
     if not getCppcheck(cppcheckPath):
         print('Failed to clone Cppcheck, retry later')
         sys.exit(1)
-    if compile_version(workpath, jobs, '1.84') == False:
-        print('Failed to compile Cppcheck-1.84, retry later')
+    if compile_version(workpath, jobs, '1.85') == False:
+        print('Failed to compile Cppcheck-1.85, retry later')
         sys.exit(1)
     if compile(cppcheckPath, jobs) == False:
         print('Failed to compile Cppcheck, retry later')
@@ -301,7 +301,7 @@ while True:
     count = ''
     elapsedTime = ''
     resultsToDiff = []
-    for cppcheck in ['cppcheck/cppcheck', '1.84/cppcheck']:
+    for cppcheck in ['cppcheck/cppcheck', '1.85/cppcheck']:
         c,errout,t = scanPackage(workpath, cppcheck, jobs)
         if c < 0:
             crash = True
@@ -313,11 +313,11 @@ while True:
     if not crash and len(resultsToDiff[0]) + len(resultsToDiff[1]) == 0:
         print('No results')
         continue
-    output = 'cppcheck: head 1.84\n'
+    output = 'cppcheck: head 1.85\n'
     output += 'count:' + count + '\n'
     output += 'elapsed-time:' + elapsedTime + '\n'
     if not crash:
-        output += 'diff:\n' + diffResults(workpath, 'head', resultsToDiff[0], '1.84', resultsToDiff[1]) + '\n'
+        output += 'diff:\n' + diffResults(workpath, 'head', resultsToDiff[0], '1.85', resultsToDiff[1]) + '\n'
     uploadResults(package, output)
     print('Results have been uploaded')
     print('Sleep 5 seconds..')