donate-cpu: use 1.85 as base version

This commit is contained in:
Daniel Marjamäki 2018-10-14 16:31:13 +02:00
parent 35f3d29093
commit 441d50df25
2 changed files with 11 additions and 11 deletions

View File

@ -51,7 +51,7 @@ def fmt(a,b,c,d,e):
def latestReport(latestResults):
html = '<html><head><title>Latest daca@home results</title></head><body>\n'
html += '<h1>Latest daca@home results</h1>'
html += '<pre>\n<b>' + fmt('Package','Date Time ','1.84','Head','Diff') + '</b>\n'
html += '<pre>\n<b>' + fmt('Package','Date Time ','1.85','Head','Diff') + '</b>\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 = '<html><head><title>Crash report</title></head><body>\n'
html += '<h1>Crash report</h1>\n'
html += '<pre>\n'
html += '<b>Package 1.84 Head</b>\n'
html += '<b>Package 1.85 Head</b>\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 = '<pre>\n'
html += '<b>MessageID 1.84 Head</b>\n'
html += '<b>MessageID 1.85 Head</b>\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

View File

@ -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..')