Handle CalledProcessError without a Python stack

[rnk]

Summary

When a child process exits with a non-zero return code, an exception is
generated. Catch the exception near the top level, print the exit code,
and don't print a Python stack trace, since this is expected behavior
when SVN isn't up or the test suite fails.

[inglorion]

zorg/buildbot/builders/annotated/annotated_builder.py

44 ↗

(On Diff #185627)

Did you mean "subprocess" instead of "subprojects"?

[inglorion]

See earlier comment.

[rnk]

zorg/buildbot/builders/annotated/annotated_builder.py

44 ↗

(On Diff #185627)

Editing code without tests is scary. :) Even to test this manually, I have to find a way to set up a failing build.

[rnk]

• fix typo

[inglorion]

LGTM

zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py

class AnnotatedBuilder:
 
     def halt_on_failure(self):
         util.report('@@@HALT_ON_FAILURE@@@')
 
     def report_build_step(self, step):
         util.report('@@@BUILD_STEP %s@@@' % (step,))
 
     def report_step_exception(self, exn=None):
+        # Don't print a stack trace if a command ('ninja check') exited with a
+        # non-zero exit code. That is non-exceptional expected behavior, so just
+        # print the return code and fail the step.
+        if exn and isinstance(exn, subprocess.CalledProcessError):
+            cmd = ""
+            try:
+                cmd = repr(exn.cmd[0])
+            except:
+                pass
+            util.report("Command " + cmd + " failed with return code " +
+                        str(exn.returncode))
+            util.report('@@@STEP_FAILURE@@@')
+            return
+
         if exn:
             util.report(str(exn))
         util.report('@@@STEP_EXCEPTION@@@')
 
     def build_and_check_stage(
         self,
         stage,
         build_dir,
def update_sources(self, source_dir, projects, revision, svn='svn'):
             'clang': 'tools/clang',
             'lld': 'tools/lld',
             'compiler-rt': 'projects/compiler-rt',
             }
         # If the project is named differently in svn, put it here.
         svn_locations = { 'clang': 'cfe' }
         svn_uri_pattern = 'https://llvm.org/svn/llvm-project/%s/trunk'
 
-        try:
-            for project in projects:
-                # TODO: Fail the build and report an error if we don't know the
-                # checkout location.
-                path = checkout_locations[project]
-                if not path:
-                    path = source_dir
-                elif not os.path.isabs(path):
-                    path = pjoin(source_dir, path)
-                uri = svn_uri_pattern % (svn_locations.get(project, project),)
-                util.report("Updating %s to %s at %s from %s" %
-                            (project, revision, util.shquote(path), uri))
-                if os.path.exists(pjoin(path, '.svn')):
-                    cmd = [svn, 'up', '-r', revision]
-                else:
-                    util.mkdirp(path)
-                    cmd = [svn, 'co', '-r', revision, uri, '.']
-                util.report_run_cmd(cmd, cwd=path)
-        except Exception as e:
-            self.report_step_exception(e)
-            raise
 
     def run_steps(
         self,
         stages=1,
         projects=None,
         check_targets=None,
         check_stages=None,
         extra_cmake_args=None,
def run_steps(
             util.report("SVN revision %s is not a positive integer" % (revision,))
 
         # Update sources.
         cwd = os.getcwd()
         source_dir = pjoin(cwd, 'llvm.src')
         build_dir = pjoin(cwd, 'build')
         cmake_args = ['-GNinja']
 
+        try:
             self.update_sources(source_dir, projects, revision)
 
             # Build and check stages.
             self.build_and_check_stages(
                 stages,
                 build_dir,
                 source_dir,
                 cmake_args,
                 extra_cmake_args,
                 c_compiler,
                 cxx_compiler,
                 linker,
                 check_stages,
                 check_targets,
                 stage1_extra_cmake_args,
                 jobs)
+        except Exception as e:
+            self.report_step_exception(e)
+            return 1
 
         return 0
 
 
 def get_vcvars(vs_tools, arch):
     """Get the VC tools environment using vswhere.exe from VS 2017
 
     This code is following the guidelines from strategy 1 in this blog post: