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

[Pavel Labath via Phabricator via lldb-commits]

labath updated this revision to Diff 122063.
labath added a comment.

Avoid mutable arguments


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,14 +918,18 @@
                        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])
@@ -948,16 +952,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
@@ -862,7 +862,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",



Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -918,14 +918,18 @@
                        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])
@@ -948,16 +952,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
@@ -862,7 +862,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",

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits