[Lldb-commits] [PATCH] D35356: [zorg] Enable assertions on the linux lldb bot

[Pavel Labath via Phabricator via lldb-commits]

labath created this revision.

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.


https://reviews.llvm.org/D35356

Files:
  buildbot/osuosl/master/config/builders.py
  zorg/buildbot/builders/LLDBBuilder.py


Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -918,6 +918,7 @@
                        buildAndroid=False,
                        runTest=True,
                        scriptExt='.sh',
+                       extra_cmake_args=[],
                        ):
     f = buildbot.process.factory.BuildFactory()
 
@@ -948,16 +949,9 @@
               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',
Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -809,7 +809,8 @@
          '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",


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D35356.106428.patch
Type: text/x-patch
Size: 1859 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20170713/943d25e0/attachment.bin>