[zorg] r210209 - Added new slave and builder for lld-x86_64-darwin13 build;

[Galina Kistanova]

Author: gkistanova
Date: Wed Jun  4 14:43:10 2014
New Revision: 210209

URL: http://llvm.org/viewvc/llvm-project?rev=210209&view=rev
Log:
Added new slave and builder for lld-x86_64-darwin13 build;
Added extra_configure_args argument to LLDBuilder and moved few configure settings to builder configuration.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/config/slaves.py
    zorg/trunk/zorg/buildbot/builders/LLDBuilder.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=210209&r1=210208&r2=210209&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Jun  4 14:43:10 2014
@@ -568,11 +568,11 @@ def _get_lldb_builders():
 # LLD builders.
 def _get_lld_builders():
     return [
-#        {'name': "lld-x86_64-darwin11",
-#         'slavenames' :["as-bldslv11"],
-#         'builddir':"lld-x86_64-darwin11",
-#         'factory': LLDBuilder.getLLDBuildFactory(clean=False),
-#         'category'   : 'lld'},
+        {'name': "lld-x86_64-darwin13",
+         'slavenames' :["as-bldslv9"],
+         'builddir':"lld-x86_64-darwin13",
+         'factory': LLDBuilder.getLLDBuildFactory(),
+         'category'   : 'lld'},
 
         {'name': "lld-x86_64-win7",
          'slavenames' :["as-bldslv4"],
@@ -584,6 +584,7 @@ def _get_lld_builders():
          'slavenames' :["as-bldslv5"],
          'builddir':"lld-x86_64-freeBSD",
          'factory': LLDBuilder.getLLDBuildFactory(jobs=32,
+                                                  extra_configure_args=['-DCMAKE_EXE_LINKER_FLAGS=-lcxxrt'],
                                                   env={'CXXFLAGS' : "-std=c++11 -stdlib=libc++"}),
          'category'   : 'lld'},
 

Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=210209&r1=210208&r2=210209&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Wed Jun  4 14:43:10 2014
@@ -30,6 +30,9 @@ def get_build_slaves():
         # FreeBSD 8.2 X86_64
         create_slave("as-bldslv8", properties={'jobs' : 2}, max_builds=1),
 
+        # Mac Pro 2.7 GHz 12-Core Intel Xeon E5, Maverick 10.9.2
+        create_slave("as-bldslv9", properties={'jobs' : 16}, max_builds=4),
+
         # Chromebook Cortex-A15 slaves
         create_slave("linaro-chrome-01", properties={'jobs' : 2}, max_builds=1),
         create_slave("linaro-chrome-02", properties={'jobs' : 2}, max_builds=1),

Modified: zorg/trunk/zorg/buildbot/builders/LLDBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBuilder.py?rev=210209&r1=210208&r2=210209&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBuilder.py Wed Jun  4 14:43:10 2014
@@ -9,6 +9,7 @@ from buildbot.process.properties import
 def getLLDBuildFactory(
            clean = True,
            jobs  = "%(jobs)s",
+           extra_configure_args=[],
            env   = {}):
 
     # Prepare environmental variables. Set here all env we want everywhere.
@@ -60,10 +61,8 @@ def getLLDBuildFactory(
     cmakeCommand = [
         "cmake",
         "-DCMAKE_BUILD_TYPE=Release",
-        "-DLLVM_ENABLE_CXX11=ON",
-        "-DLLVM_ENABLE_WERROR=ON",
-        "-DCMAKE_EXE_LINKER_FLAGS=-lcxxrt",
-        "../%s" % llvm_srcdir]
+        "-DLLVM_ENABLE_WERROR=ON"] + extra_configure_args + ["../%s" % llvm_srcdir]
+
     # Note: ShellCommand does not pass the params with special symbols right.
     # The " ".join is a workaround for this bug.
     f.addStep(ShellCommand(name="cmake-configure",