rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb: Add platform reporting for better host reviewing in posted email reports.

Browse Source
This commit is contained in:
Chris Johns 2017-10-31 11:57:21 +11:00
parent 4e7fdaf15d
commit 4dc9bf3a37
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source-builder/sb/reports.py
View File

@ -64,6 +64,18 @@ def _make_path(p, *args):
p = path.join(p, arg) p = path.join(p, arg)
return os.path.abspath(path.host(p)) return os.path.abspath(path.host(p))
def platform(mode = 'all'):
import platform
if mode == 'system':
return platform.system()
compact = platform.platform(aliased = True)
if mode == 'compact':
return compact
extended = ' '.join(platform.uname())
if mode == 'extended':
return extended
return '%s (%s)' % (short, extended)
class formatter(object): class formatter(object):
def __init__(self): def __init__(self):
self.content = '' self.content = ''

18
source-builder/sb/setbuilder.py
View File

@ -30,6 +30,7 @@ import glob
import operator import operator
import os import os
import sys import sys
import textwrap
try: try:
import build import build
@ -341,7 +342,8 @@ class buildset:
log.trace('_bset: %s: make' % (self.bset)) log.trace('_bset: %s: make' % (self.bset))
log.notice('Build Set: %s' % (self.bset)) log.notice('Build Set: %s' % (self.bset))
mail_subject = '%s on %s' % (self.bset, self.macros.expand('%{_host}')) mail_subject = '%s on %s' % (self.bset,
self.macros.expand('%{_host}'))
current_path = os.environ['PATH'] current_path = os.environ['PATH']
@ -472,10 +474,12 @@ class buildset:
self.write_mail_header('Build Time: %s' % (build_time), True) self.write_mail_header('Build Time: %s' % (build_time), True)
self.write_mail_header('', True) self.write_mail_header('', True)
if self.build_failure is not None: if self.build_failure is not None:
mail_subject = 'Build : FAILED %s (%s)' % \ mail_subject = 'FAILED %s (%s)' % \
(mail_subject, self.build_failure) (mail_subject, self.build_failure)
else: else:
mail_subject = 'Build : PASSED %s' % (mail_subject) mail_subject = 'PASSED %s' % (mail_subject)
mail_subject = 'Build %s: %s' % (reports.platform(mode = 'system'),
mail_subject)
self.write_mail_header(mail['header'], True) self.write_mail_header(mail['header'], True)
self.write_mail_header('') self.write_mail_header('')
log.notice('Mailing report: %s' % (mail['to'])) log.notice('Mailing report: %s' % (mail['to']))
@ -534,9 +538,13 @@ def run():
if not check.host_setup(opts): if not check.host_setup(opts):
raise error.general('host build environment is not set up correctly') raise error.general('host build environment is not set up correctly')
if mail: if mail:
mail['header'] = os.linesep.join(mail['output'].get()) mail['header'] = os.linesep.join(mail['output'].get()) + os.linesep
mail['header'] += os.linesep mail['header'] += os.linesep
mail['header'] += opts.info() + os.linesep mail['header'] += 'Host: ' + reports.platform('compact') + os.linesep
indent = ' '
for l in textwrap.wrap(reports.platform('extended'),
width = 80 - len(indent)):
mail['header'] += indent + l + os.linesep
configs = build.get_configs(opts) configs = build.get_configs(opts)
if opts.get_arg('--list-deps'): if opts.get_arg('--list-deps'):
deps = [] deps = []