[lldb] Add support for choosing which checks to run on lldb builders

[stella.stamenova]

Summary

This change adds the option to select checks for the lldb builders and then uses the new option for the windows lldb builder.

The implementation is based on how the UnifiedTreeBuilder handles the checks.

[stella.stamenova]

zorg/buildbot/builders/LLDBBuilder.py

112

@gkistanova : What version of python runs on buildbot? This should work fine for Python 3, but not for Python 2 if I remember correctly.

[JDevlieghere]

LGTM

zorg/buildbot/builders/LLDBBuilder.py

112

According to https://lab.llvm.org/buildbot/#/about, it's running Python 3.6.

[gkistanova]

The patch looks good. Thanks, Stella!

Jonas is right, we are running Python 3 on buildbot, so that's fine.

zorg/buildbot/builders/LLDBBuilder.py

111

Are you sure you don't want to use LitTestCommand for the check steps? That would parse the test failures and warnings and would provide a bit better UI for that. The check-lldb* tests are LIT tests, right?

[stella.stamenova]

@gkistanova: Thanks for the review! Since @omjavaid asked if we could keep the API tests running, I am going to see if there are other things we can do before disabling them entirely, so I've put this change on hold for the moment. If we end up not needing it, I'll abandon it. I sent out https://reviews.llvm.org/D118403 earlier which will disable just all of the watchpoint tests and that should help with stability.

zorg/buildbot/builders/LLDBBuilder.py

111

They are lit tests, thanks for pointing this out. If we decide to make this change in addition to the new one I sent out, I'll make the change.

[stella.stamenova]

Disabling the watchpoint tests was sufficient to get the buildbot happy, so we no longer have need of this.

buildbot/osuosl/master/config/builders.py

'factory' : LLDBBuilder.getLLDBCMakeBuildFactory(
                         '-DLLVM_USE_LINKER=gold'])},
 
     {'name' : "lldb-x64-windows-ninja",
     'tags'  : ["lldb"],
     'workernames' : ["win-py3-buildbot"],
     'builddir': "lldb-x64-windows-ninja",
     'factory' : LLDBBuilder.getLLDBCMakeBuildFactory(
                     clean=True,
-                    python_source_dir=r'"C:\Program Files (x86)\Microsoft Visual Studio\Shared\Python36_64"',
                     target_arch='x64',
                     vs="autodetect",
                     test=True,
+                    checks=[
+                        'check-lldb-shell',
+                        'check-lldb-unit'],
                     extra_cmake_args=[
                         '-DLLVM_ENABLE_ASSERTIONS=OFF',
                         '-DLLVM_ENABLE_ZLIB=FALSE',
                         '-DLLDB_ENABLE_PYTHON=TRUE'])},
 
 # LLD builders.
 
     {'name' : "lld-x86_64-win",

zorg/buildbot/builders/LLDBBuilder.py

def getLLDBCMakeBuildFactory(
             # Default values for VS devenv and build configuration
             vs=None,
             config='Release',
             target_arch='x86',
 
             extra_cmake_args=None,
             test=False,
             testTimeout=2400,
+            checks=None,
             install=False):
 
     ############# PREPARING
 
     # Global configurations
     build_dir='build'
 
     f = LLVMBuildFactory(
             depends_on_projects=["llvm", "clang", "lldb", "lld"],
             obj_dir=build_dir)
 
     env = {}
     # Determine Slave Environment and Set MSVC environment.
     if vs and vs != 'manual':
         f.addStep(SetProperty(
             command=getVisualStudioEnvironment(vs, target_arch),
             extract_fn=extractVSEnvironment))
         env = Property('vs_env')
 
+    if checks is None:
+        checks = ['check-lldb']
+
     f.addGetSourcecodeSteps()
 
     build_cmd=['ninja']
     install_cmd = ['ninja','install']
-    test_cmd = ['ninja','check-lldb']
+    test_cmd = ['ninja']
     lit_args = '-v'
 
     if jobs:
         build_cmd.append(WithProperties("-j%s" % jobs))
         install_cmd.append(WithProperties("-j%s" % jobs))
         test_cmd.append(WithProperties("-j%s" % jobs))
         lit_args += " -j%s" % jobs
 
f.addStep(ShellCommand(name='install',
                           command=install_cmd,
                           flunkOnFailure=ignoreInstallFail,
                           description='ninja install',
                           workdir=build_dir,
                           doStepIf=bool(install),
                           env=env))
 
     ignoreTestFail = bool(test != 'ignoreFail')
-    f.addStep(ShellCommand(name='test',
-                          command=test_cmd,
+    for check in checks:
+        f.addStep(ShellCommand(name='test-%s' % check,
+                              command=[*test_cmd, check],
                               flunkOnFailure=ignoreTestFail,
                               timeout=testTimeout,
-                          description='ninja test',
+                              description='ninja test %s' % check,
                               workdir=build_dir,
                               doStepIf=bool(test),
                               env=env))
 
     return f