diff options
| author | Simon Glass <sjg@chromium.org> | 2021-06-11 17:16:38 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-22 17:56:13 +0000 |
| commit | 2e26c8e92bd0f562827373e8b304e0d51037665c (patch) | |
| tree | 8feafc8ed4ff04682b11d2603d67ced9aa8fdc07 /zephyr/zmake | |
| parent | bc6852a68d70266fcb5abcd4663e30984347a8de (diff) | |
| download | chrome-ec-2e26c8e92bd0f562827373e8b304e0d51037665c.tar.gz | |
zmake: Report errors and warnings
Both Cmake and ninja can report errors and warnings which are
currently lost, unless debugging is on. Update the filters to handle
all warnings/errors the same.
BUG=b:184298184
BRANCH=none
TEST=manually tested after seeing errors/warnings along the way
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: Ib1893e3d634e22962623f132672e6df80d00da20
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2957551
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
Diffstat (limited to 'zephyr/zmake')
| -rw-r--r-- | zephyr/zmake/zmake/zmake.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py index 2415c76d9f..e0a2debf59 100644 --- a/zephyr/zmake/zmake/zmake.py +++ b/zephyr/zmake/zmake/zmake.py @@ -20,7 +20,8 @@ import zmake.toolchains as toolchains import zmake.util as util import zmake.version -ninja_warnings = re.compile(r'\S*: warning:.*') +ninja_warnings = re.compile(r'^(\S*: )?warning:.*') +ninja_errors = re.compile(r'error:.*') def ninja_stdout_log_level_override(line, current_log_level): @@ -75,6 +76,8 @@ def ninja_stdout_log_level_override(line, current_log_level): return logging.DEBUG if ninja_warnings.match(line): return logging.WARNING + if ninja_errors.match(line): + return logging.ERROR # When we see "Memory region" go into INFO, and stay there as long as the # line starts with \S+: if line.startswith("Memory region"): @@ -102,6 +105,10 @@ def cmake_log_level_override(line, default_log_level): return logging.DEBUG elif line.startswith("devicetree error:"): return logging.ERROR + if ninja_warnings.match(line): + return logging.WARNING + if ninja_errors.match(line): + return logging.ERROR return default_log_level |