diff options
| author | Jeremy Bettis <jbettis@google.com> | 2022-02-24 09:10:15 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-02-24 19:15:39 +0000 |
| commit | 137269ca24495cc2b0fecec35cc62d8e8480f880 (patch) | |
| tree | 124c7b7cf0cd886c5fc6205fe657b506f35da723 /zephyr/zmake | |
| parent | 4466d6df1f198ce85c4cc1dff9715a697fb4adc9 (diff) | |
| download | chrome-ec-137269ca24495cc2b0fecec35cc62d8e8480f880.tar.gz | |
zmake: Don't call wait in a executor job
Calling self.executor.wait() from within a function that was added to
self.executor.append() will cause a deadlock. So don't do that anymore.
BRANCH=None
BUG=b:217788621
TEST=zmake testall; zmake -j8 testall
Change-Id: Id7a586bba0c05b78f49d9c70fed3560944564af8
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3488787
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'zephyr/zmake')
| -rw-r--r-- | zephyr/zmake/zmake/zmake.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py index 585726f5af..50ca5680ef 100644 --- a/zephyr/zmake/zmake/zmake.py +++ b/zephyr/zmake/zmake/zmake.py @@ -582,10 +582,6 @@ class Zmake: timeout=project.config.test_timeout_secs, ) ) - if self._sequential: - rv = self.executor.wait() - if rv: - return rv return 0 def _build( |