[zorg] Enable assertions on the linux lldb bot

[labath]

Summary

This adds support for the extra_cmake_args argument to the
LLDBScriptCommandsFactory and uses that to enable assertions on the
linux bot.

While I'm in there, I also remove the "update ndk" step -- it was a bad
idea because it's introducing android-specific code into generic code,
and we never ended up using it anyway.

[gkistanova]

Hi Pavel,

The patch looks Ok, with a small issue to address before committing.

zorg/buildbot/builders/LLDBBuilder.py

921 ↗

(On Diff #106428)

Please do not use mutable default arguments.
See http://docs.python-guide.org/en/latest/writing/gotchas/#mutable-default-arguments for more details.

954 ↗

(On Diff #106428)

This is not a blocker for this patch. With all the same, it would be nice to use the CmakeCommand here instead of the ShellCommand.

[labath]

Avoid mutable arguments

[labath]

I am sorry about the delay, I was on extended leave.

zorg/buildbot/builders/LLDBBuilder.py

921 ↗

(On Diff #106428)

Wow, that's quite a surprise. I was not aware of that.

954 ↗

(On Diff #106428)

These buildbots deliberately invoke scripts instead of running the commands directly to provide an opportunity to tweak the configuration without restarting the master. I'm honestly not sure whether that was the right choice to begin with, but backing out of that now is not something I feel comfortable doing as a part of this patch.

zorg/trunk/buildbot/osuosl/master/config/builders.py

return [
         #'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory(config='Debug')},
         {'name': "lldb-x86_64-ubuntu-14.04-buildserver",
          'slavenames': ["lldb-linux-android-buildserver"],
          'builddir': "lldb-android-buildserver",
          'category' : 'lldb',
          'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
                     downloadBinary=False,
                     buildAndroid=True,
-                    runTest=False)},
+                    runTest=False,
+                    extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON'])},
         {'name': "lldb-x86_64-ubuntu-14.04-cmake",
          'slavenames': ["lldb-build1-ubuntu-1404"],
          'builddir': "buildWorkingDir",
          'category' : 'lldb',
          'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
                     downloadBinary=False,
                     buildAndroid=False,
                     runTest=True)},

zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py

for x in range(1, 10):
                                  warnOnFailure=(x<7),
                                  workdir='scripts'))
 
 def getLLDBScriptCommandsFactory(
                        downloadBinary=True,
                        buildAndroid=False,
                        runTest=True,
                        scriptExt='.sh',
+                       extra_cmake_args=None,
                        ):
     f = buildbot.process.factory.BuildFactory()
 
     if scriptExt is '.bat':
         pathSep = '.\\'
     else:
         pathSep = './'
 
+    if extra_cmake_args is None:
+        extra_cmake_args = []
+
     # Update scripts
     getShellCommandStep(f, name='update scripts',
                         command=['updateScripts' + scriptExt])
 
     # Acquire lock
     if downloadBinary:
         getShellCommandStep(f, name='acquire lock',
                             command=[pathSep + 'acquireLock' + scriptExt,
                                      'totBuild'],
                             description='get')
 
     # Checkout source code
     getShellCommandStep(f, name='checkout source code',
                         command=[pathSep + 'checkoutSource' + scriptExt,
                                  WithProperties('%(revision)s')])
 
     # Set source revision
     f.addStep(SetProperty(name="set revision",
               command=[pathSep + 'getRevision' + scriptExt],
               property="got_revision",
               workdir="scripts"))
 
-    # Update NDK and create toolchains
-    getShellCommandStep(f, name='ndk download and toolchains update',
-                        command=[pathSep + 'updateToolChain' + scriptExt],
-                        description=["Update NDK toolchain"],
-                        flunkOnFailure=False,
-                        haltOnFailure=False)
-
     # Configure
     getShellCommandStep(f, name='cmake local',
-                        command=[pathSep + 'cmake' + scriptExt])
+                        command=[pathSep + 'cmake' + scriptExt] + extra_cmake_args)
 
     # Build
     getShellCommandStep(f, name='ninja build local',
                         command=[pathSep + 'buildLocal' + scriptExt])
     if buildAndroid:
         getShellCommandStep(f, name='build android',
                             command=[pathSep + 'buildAndroid' + scriptExt])