diff options
author | Simon Glass <sjg@chromium.org> | 2023-07-05 13:19:24 +0100 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2023-07-12 09:48:19 -0600 |
commit | 4b9a5b80cdea6dd0aab016a8b148b1f0bd0d6cb7 (patch) | |
tree | b4f948edd9ef6ad225eff803548a2025b59184a5 | |
parent | deb8032357c41599be22b11d8821e2ab14f0050f (diff) | |
download | u-boot-4b9a5b80cdea6dd0aab016a8b148b1f0bd0d6cb7.zip u-boot-4b9a5b80cdea6dd0aab016a8b148b1f0bd0d6cb7.tar.gz u-boot-4b9a5b80cdea6dd0aab016a8b148b1f0bd0d6cb7.tar.bz2 |
buildman: Tidy up reporting of a toolchain error
Provide the text of the exception when something goes wrong.
Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | tools/buildman/builderthread.py | 7 | ||||
-rw-r--r-- | tools/buildman/func_test.py | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index d391239..043e92b 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -457,18 +457,13 @@ class BuilderThread(threading.Thread): except ValueError as err: result.return_code = 10 result.stdout = '' - result.stderr = str(err) - # TODO(sjg@chromium.org): This gets swallowed, but needs - # to be reported. + result.stderr = f'Tool chain error for {brd.arch}: {str(err)}' if self.toolchain: commit = self._checkout(commit_upto, work_dir) result, do_config = self._config_and_build( commit_upto, brd, work_dir, do_config, config_only, adjust_cfg, commit, out_dir, out_rel_dir, result) - else: - result.return_code = 1 - result.stderr = f'No tool chain for {brd.arch}\n' result.already_done = False result.toolchain = self.toolchain diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index f505855..aa08385 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -503,8 +503,10 @@ Some images are invalid''' if brd.arch != 'sandbox': errfile = self._builder.get_err_file(commit, brd.target) fd = open(errfile) - self.assertEqual(fd.readlines(), - ['No tool chain for %s\n' % brd.arch]) + self.assertEqual( + fd.readlines(), + [f'Tool chain error for {brd.arch}: ' + f"No tool chain found for arch '{brd.arch}'"]) fd.close() def testBranch(self): |