From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7A581138334 for ; Fri, 21 Jun 2019 19:02:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B4D3E0937; Fri, 21 Jun 2019 19:02:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6B516E0937 for ; Fri, 21 Jun 2019 19:02:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C434E3466C4 for ; Fri, 21 Jun 2019 19:01:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C55E606 for ; Fri, 21 Jun 2019 19:01:57 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1561143707.fc4d9347493a79add06058c70f506769bbedd4b9.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/auto-bootstraps/analyse_result.py X-VCS-Directories: scripts/auto-bootstraps/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: fc4d9347493a79add06058c70f506769bbedd4b9 X-VCS-Branch: master Date: Fri, 21 Jun 2019 19:01:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 81d61397-4db5-4d3e-8863-55b5166d0aa0 X-Archives-Hash: 336c188177751d1abe06506dcd3aa37d commit: fc4d9347493a79add06058c70f506769bbedd4b9 Author: Fabian Groffen gentoo org> AuthorDate: Fri Jun 21 19:01:12 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Jun 21 19:01:47 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fc4d9347 scripts/auto-bootstraps/analyse_result: flag libressl builds Signed-off-by: Fabian Groffen gentoo.org> scripts/auto-bootstraps/analyse_result.py | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py index 90312300db..dbe0d4c729 100755 --- a/scripts/auto-bootstraps/analyse_result.py +++ b/scripts/auto-bootstraps/analyse_result.py @@ -117,6 +117,7 @@ with os.scandir(resultsdir) as it: fail, state, suc = analyse_arch(os.path.join(resultsdir, arch)) elapsedtime = None + haslssl = False if suc: elapsedf = os.path.join(resultsdir, arch, "%s" % suc, "elapsedtime") if os.path.exists(elapsedf): @@ -124,8 +125,16 @@ with os.scandir(resultsdir) as it: l = f.readline() if l is not '': elapsedtime = int(l) - - archs[arch] = (fail, state, suc, elapsedtime) + mconf = os.path.join(resultsdir, arch, "%s" % suc, "make.conf") + if os.path.exists(mconf): + with open(mconf, 'rb') as f: + l = [x.decode('utf-8', 'ignore') for x in f.readlines()] + l = list(filter(lambda x: 'USE=' in x, l)) + for x in l: + if 'libressl' in x: + haslssl = True + + archs[arch] = (fail, state, suc, elapsedtime, haslssl) if not suc: color = '\033[1;31m' # red elif fail and suc < fail: @@ -133,7 +142,7 @@ with os.scandir(resultsdir) as it: else: color = '\033[1;32m' # green endc = '\033[0m' - print("%s%24s: suc %8s fail %8s%s" % (color, arch, suc, fail, endc)) + print("%s%30s: suc %8s fail %8s%s" % (color, arch, suc, fail, endc)) sarchs = sorted(archs, key=lambda a: '-'.join(a.split('-')[::-1])) @@ -148,7 +157,7 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h: h.write("last successful runlast failed run") h.write("failure") for arch in sarchs: - fail, errcode, suc, et = archs[arch] + fail, errcode, suc, et, lssl = archs[arch] if not suc: state = 'red' elif fail and suc < fail: @@ -156,6 +165,13 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h: else: state = 'limegreen' + tags = '' + if lssl: + tags = tags + ''' +libressl +''' + h.write('') h.write('' % state) @@ -172,14 +188,14 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h: etxt = ' (%.1f hours)' % (et / 3600) else: etxt = ' (%d minutes)' % (et / 60) - h.write('%s%s' % (arch, suc, suc, etxt)) + h.write('%s%s%s' % (arch, suc, suc, etxt, tags)) else: h.write('never') h.write("") h.write("") if fail: - h.write('%s' % (arch, fail, fail)) + h.write('%s%s' % (arch, fail, fail, tags)) else: h.write('never') h.write("")