[zorg] r322171 - [zorg] Enable assertions on the linux lldb bot

[Pavel Labath via llvm-commits]

Author: labath
Date: Wed Jan 10 03:23:21 2018
New Revision: 322171

URL: http://llvm.org/viewvc/llvm-project?rev=322171&view=rev
Log:
[zorg] Enable assertions on the linux lldb bot

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.

Reviewers: gkistanova

Subscribers: krytarowski, emaste, lldb-commits

Differential Revision: https://reviews.llvm.org/D35356

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=322171&r1=322170&r2=322171&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Jan 10 03:23:21 2018
@@ -887,7 +887,8 @@ def _get_lldb_builders():
          '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",

Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=322171&r1=322170&r2=322171&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Wed Jan 10 03:23:21 2018
@@ -918,6 +918,7 @@ def getLLDBScriptCommandsFactory(
                        buildAndroid=False,
                        runTest=True,
                        scriptExt='.sh',
+                       extra_cmake_args=None,
                        ):
     f = buildbot.process.factory.BuildFactory()
 
@@ -926,6 +927,9 @@ def getLLDBScriptCommandsFactory(
     else:
         pathSep = './'
 
+    if extra_cmake_args is None:
+        extra_cmake_args = []
+
     # Update scripts
     getShellCommandStep(f, name='update scripts',
                         command=['updateScripts' + scriptExt])
@@ -948,16 +952,9 @@ def getLLDBScriptCommandsFactory(
               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',