diff options
| author | Jeremy Bettis <jbettis@google.com> | 2021-08-30 12:36:47 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-01 21:31:18 +0000 |
| commit | 80c761e2eba63ffd6210a67d1d314b85a1ff4c92 (patch) | |
| tree | 6aef19d087588839b8029d364f0a0f93828f974b /zephyr/zmake/zmake | |
| parent | 14b2c5df42665b8d592807de604ec7a930ead262 (diff) | |
| download | chrome-ec-80c761e2eba63ffd6210a67d1d314b85a1ff4c92.tar.gz | |
zmake: Handle -j1 correctly in coverage
If we are running zmake -j1 coverage, then wait after each job so that
nothing runs in parallel.
BUG=None
TEST=zmake -j1 coverage
BRANCH=None
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: Ic709cd187414f3886bc28731f78748993bfac95e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3130624
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'zephyr/zmake/zmake')
| -rw-r--r-- | zephyr/zmake/zmake/zmake.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py index 70f58ed129..58afdbfec0 100644 --- a/zephyr/zmake/zmake/zmake.py +++ b/zephyr/zmake/zmake/zmake.py @@ -635,7 +635,11 @@ class Zmake: proc.stderr, job_id=job_id, ) - procs.append(proc) + if self._sequential: + if proc.wait(): + raise OSError(get_process_failure_msg(proc)) + else: + procs.append(proc) for proc in procs: if proc.wait(): @@ -685,6 +689,10 @@ class Zmake: project, project_build_dir, lcov_file ) ) + if self._sequential: + rv = self.executor.wait() + if rv: + return rv rv = self.executor.wait() if rv: |