[PATCH] D45295: report error messages in annotated_builder.py
Bob Haarman via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 5 17:10:38 PDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rL329365: report error messages in annotated_builder.py (authored by inglorion, committed by ).
Repository:
rL LLVM
https://reviews.llvm.org/D45295
Files:
zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py
Index: zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py
===================================================================
--- zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py
+++ zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py
@@ -35,7 +35,9 @@
def report_build_step(self, step):
util.report('@@@BUILD_STEP %s@@@' % (step,))
- def report_step_exception(self):
+ def report_step_exception(self, exn=None):
+ if exn:
+ util.report(str(exn))
util.report('@@@STEP_EXCEPTION@@@')
def build_and_check_stage(
@@ -123,10 +125,9 @@
self.halt_on_failure()
try:
util.clean_dir(build_dir)
- except OSError as e:
- if e.errno != errno.ENOENT:
- self.report_step_exception()
- raise
+ except Exception as e:
+ self.report_step_exception(e)
+ raise
def cmake(
self,
@@ -233,8 +234,8 @@
for var in sorted(os.environ.keys()):
util.report('%s=%s' % (var, os.environ[var]))
- except:
- self.report_step_exception()
+ except Exception as e:
+ self.report_step_exception(e)
raise
def update_sources(self, source_dir, projects, revision=None, svn='svn'):
@@ -258,8 +259,8 @@
util.mkdirp(path)
cmd = [svn, 'co'] + revision_args + [uri, '.']
util.report_run_cmd(cmd, cwd=path)
- except:
- self.report_step_exception()
+ except Exception as e:
+ self.report_step_exception(e)
raise
def run_steps(
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D45295.141242.patch
Type: text/x-patch
Size: 1702 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180406/132dfec1/attachment.bin>
More information about the llvm-commits
mailing list