From dcff9b15e70921e1f0931b5b999d9aa7b6ec011d Mon Sep 17 00:00:00 2001 From: Mihail Stoyanov Date: Tue, 14 Jun 2016 01:57:01 +0100 Subject: [PATCH] Minor update to tools - logging of tests and output --- tools/build_api.py | 2 -- tools/toolchains/__init__.py | 13 +++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/build_api.py b/tools/build_api.py index f8b80991626..3904cd3bf3b 100644 --- a/tools/build_api.py +++ b/tools/build_api.py @@ -383,8 +383,6 @@ def build_library(src_paths, build_path, target, toolchain_name, if toolchain_output: cur_result["output"] += toolchain_output - cur_result["output"] += str(e) - add_result_to_report(report, cur_result) # Let Exception propagate diff --git a/tools/toolchains/__init__.py b/tools/toolchains/__init__.py index 777a2cd1745..464ad5d0635 100644 --- a/tools/toolchains/__init__.py +++ b/tools/toolchains/__init__.py @@ -241,8 +241,9 @@ def __init__(self, target, options=None, notify=None, macros=None, silent=False, self.mp_pool = None - if 'UVISOR_PRESENT=1' in self.macros: + if 'UVISOR' in self.target.features and 'UVISOR_SUPPORTED' in self.target.extra_labels: self.target.core = re.sub(r"F$", '', self.target.core) + self.flags = deepcopy(self.DEFAULT_FLAGS) def get_output(self): @@ -253,9 +254,12 @@ def print_notify(self, event, silent=False): """ msg = None - if event['type'] in ['info', 'debug']: + if not self.VERBOSE and event['type'] == 'tool_error': msg = event['message'] - + + elif event['type'] in ['info', 'debug']: + msg = event['message'] + elif event['type'] == 'cc': event['severity'] = event['severity'].title() event['file'] = basename(event['file']) @@ -775,9 +779,6 @@ def link_program(self, r, tmp_path, name): def default_cmd(self, command): self.debug("Command: %s"% ' '.join(command)) _stdout, _stderr, _rc = run_cmd(command) - # Print all warning / erros from stderr to console output - for error_line in _stderr.splitlines(): - print error_line self.debug("Return: %s"% _rc)