diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2021-04-13 10:55:19 -0600 |
|---|---|---|
| committer | Jack Rosenthal <jrosenth@chromium.org> | 2021-04-13 17:02:24 +0000 |
| commit | 5bc4134337bdabd601159bce047306c73f13e8f8 (patch) | |
| tree | 388e2a32778ff436ecdc6d168c433e9f7f83f2e9 /zephyr/zmake/zmake/zmake.py | |
| parent | a984234afc7763018f9b5f9e767e567fd1137e4c (diff) | |
| download | chrome-ec-5bc4134337bdabd601159bce047306c73f13e8f8.tar.gz | |
Revert "zephyr: zmake: Ensure all output is produced"
This reverts commit ee4257735632f5453b9377f9f60f5c68f6917537.
Reason for revert: depends on CL:2807486, which is responsible for CQ
failures (crbug.com/1198472).
BUG=chromium:1198472
BRANCH=none
TEST=pytest zephyr/zmake/test
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I5face75f3e59858b68a0b6e77d5c5b1a9881008a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2823547
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Diffstat (limited to 'zephyr/zmake/zmake/zmake.py')
| -rw-r--r-- | zephyr/zmake/zmake/zmake.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py index fca71154d2..daed8e1af1 100644 --- a/zephyr/zmake/zmake/zmake.py +++ b/zephyr/zmake/zmake/zmake.py @@ -277,18 +277,9 @@ class Zmake: True if all if OK False if an error was found (so that zmake should exit) """ - # Let all output be produced before exiting - bad = None for proc in procs: - if proc.wait() and not bad: - bad = proc - if bad: - # Just show the first bad process for now. Both builds likely - # produce the same error anyway. If they don't, the user can - # still take action on the errors/warnings provided. Showing - # multiple 'Execution failed' messages is not very friendly - # since it exposes the fragmented nature of the build. - raise OSError(get_process_failure_msg(bad)) + if proc.wait(): + raise OSError(get_process_failure_msg(proc)) if (fail_on_warnings and any(w.has_written(logging.WARNING) or |