Implement timeout for ClangBuilder

[ro]

Summary

As a followup to D129961, this patch actually implements for timeout parameter for ClangBuilder.

I've only passed it to the actual build and test steps (build stage [12], ninja check [12], and test-suite.

This is untested and derived from my understanding that both WarningCountingShellCommand and LitTestCommand resp. their superclasses implement the timeout parameter. It's unfortunate that I have to hardcode the default value (1200) to keep if unchanged if not specified, but I found no better way given that None means no timeout.

zorg/buildbot/builders/ClangBuilder.py

return _getClangCMakeBuildFactory(
                use_pixz_compression=use_pixz_compression,
                trigger_after_stage1=trigger_after_stage1)
 
 def getClangCMakeBuildFactory(
             clean=True,
             checks=None,
             cmake='cmake',
             jobs=None,
-            timeout=None, # TODO: Implement support for timeout
+            timeout=1200,
 
             # VS tools environment variable if using MSVC. For example,
             # %VS120COMNTOOLS% selects the 2013 toolchain.
             vs=None,
             vs_target_arch='x86',
 
             # Multi-stage compilation
             useTwoStage=False,
def getClangCMakeBuildFactory(
             # Extra repositories
             checkout_clang_tools_extra=True,
             checkout_compiler_rt=True,
             checkout_lld=True,
             checkout_libcxx=False,
             checkout_flang=False,
             checkout_test_suite=False):
     return _getClangCMakeBuildFactory(
-               clean=clean, checks=checks, cmake=cmake, jobs=jobs, vs=vs,
+               clean=clean, checks=checks, cmake=cmake, jobs=jobs,
+               timeout=timeout,vs=vs,
                vs_target_arch=vs_target_arch, useTwoStage=useTwoStage,
                testStage1=testStage1, stage1_config=stage1_config,
                stage2_config=stage2_config, runTestSuite=runTestSuite,
                nt_flags=nt_flags, testsuite_flags=testsuite_flags,
                submitURL=submitURL, testerName=testerName,
                env=env, extra_cmake_args=extra_cmake_args,
                checkout_clang_tools_extra=checkout_clang_tools_extra,
                checkout_lld=checkout_lld,
                checkout_compiler_rt=checkout_compiler_rt,
                checkout_libcxx=checkout_libcxx,
                checkout_flang=checkout_flang,
                checkout_test_suite=checkout_test_suite)
 
 def _getClangCMakeBuildFactory(
             clean=True,
             checks=None,
             cmake='cmake',
             jobs=None,
+            timeout=1200,
 
             # VS tools environment variable if using MSVC. For example,
             # %VS120COMNTOOLS% selects the 2013 toolchain.
             vs=None,
             vs_target_arch='x86',
 
             # Multi-stage compilation
             useTwoStage=False,
f.addStep(ShellCommand(name='cmake stage 1',
                            haltOnFailure=True,
                            description='cmake stage 1',
                            workdir=stage1_build,
                            doStepIf=FileDoesNotExist("build.ninja"),
                            env=env))
 
     f.addStep(WarningCountingShellCommand(name='build stage 1',
                                           command=ninja_cmd,
+                                          timeout=timeout,
                                           haltOnFailure=True,
                                           description='ninja all',
                                           workdir=stage1_build,
                                           env=env))
 
     if checks and testStage1:
         haltOnStage1Check = not useTwoStage and not runTestSuite
         f.addStep(LitTestCommand(name='ninja check 1',
                                  command=ninja_check_cmd,
+                                 timeout=timeout,
                                  haltOnFailure=haltOnStage1Check,
                                  description=["checking stage 1"],
                                  descriptionDone=["stage 1 checked"],
                                  workdir=stage1_build,
                                  env=env))
 
     if useTwoStage or runTestSuite or stage1_upload_directory:
         f.addStep(ShellCommand(name='clean stage 1 install',
if useTwoStage:
                                command=cmake_cmd2,
                                haltOnFailure=True,
                                description='cmake stage 2',
                                workdir=stage2_build,
                                env=env))
 
         f.addStep(WarningCountingShellCommand(name='build stage 2',
                                               command=ninja_cmd,
+                                              timeout=timeout,
                                               haltOnFailure=True,
                                               description='ninja all',
                                               workdir=stage2_build,
                                               env=env))
 
         if checks:
             f.addStep(LitTestCommand(name='ninja check 2',
                                      command=ninja_check_cmd,
+                                     timeout=timeout,
                                      haltOnFailure=not runTestSuite,
                                      description=["checking stage 2"],
                                      descriptionDone=["stage 2 checked"],
                                      workdir=stage2_build,
                                      env=env))
 
     ############# TEST SUITE
     ## Test-Suite (stage 2 if built, stage 1 otherwise)
if runTestSuite:
         f.addStep(ShellCommand(name='setup lit',
                                command=[python, lnt_setup, 'develop'],
                                haltOnFailure=True,
                                description='setting up LNT in sandbox',
                                workdir='test/sandbox',
                                env=env))
         f.addStep(LitTestCommand(
                                name='test-suite',
+                               timeout=timeout,
                                command=test_suite_cmd,
                                haltOnFailure=True,
                                description=['running the test suite'],
                                workdir='test/sandbox',
                                logfiles={'configure.log'   : 'build/configure.log',
                                          'build-tools.log' : 'build/build-tools.log',
                                          'test.log'        : 'build/test.log',
                                          'report.json'     : 'build/report.json'},
                                env=test_suite_env))
 
     return f