diff options
author | Simon Glass <sjg@chromium.org> | 2021-03-28 15:55:40 +1300 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-03-31 06:11:38 +0000 |
commit | adfaecd09ed03f133ede8425c123690b1f09fb4b (patch) | |
tree | ed0541577a9d803462b56ac8918287c991667f03 | |
parent | c8f5bcc1ba0100ab7242898e5982b849b910ae90 (diff) | |
download | chrome-ec-adfaecd09ed03f133ede8425c123690b1f09fb4b.tar.gz |
zephyr: zmake: Drop the 'boilerplate' message on stderr
The 'Including boilerplate' message is still there on every build and
still doesn't seem that useful. Add a filter to the stderr output so we
can move it to DEBUG.
BUG=b:177096315
BRANCH=none
TEST=manually test by running zmake build / configure
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: I6e356c0abecbbba624fd41144a3c460398a4e874
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2789795
Reviewed-by: Yuval Peress <peress@chromium.org>
-rw-r--r-- | zephyr/zmake/zmake/zmake.py | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py index 066d853fde..315d92d6e5 100644 --- a/zephyr/zmake/zmake/zmake.py +++ b/zephyr/zmake/zmake/zmake.py @@ -79,6 +79,22 @@ def ninja_log_level_override(line, default_log_level): return default_log_level +def cmake_log_level_override(line, default_log_level): + """Update the log level for cmake builds if we hit an error. + + Cmake prints some messages that are less than useful during development. + + Args: + line: The line that is about to be logged. + default_log_level: The default logging level that will be used for the + line. + """ + # Strange output from Zephyr that we normally ignore + if line.startswith("Including boilerplate"): + return logging.DEBUG + return default_log_level + + def get_process_failure_msg(proc): """Creates a suitable failure message if something exits badly @@ -268,7 +284,11 @@ class Zmake: log_level=logging.INFO, file_descriptor=proc.stdout, log_level_override_func=ninja_log_level_override) - zmake.multiproc.log_output(self.logger, logging.ERROR, proc.stderr) + zmake.multiproc.log_output( + self.logger, + logging.ERROR, + proc.stderr, + log_level_override_func=cmake_log_level_override) procs.append(proc) for proc in procs: |