[zorg] r175780 - Added lld-x86_64-darwin11 builder.

[Galina Kistanova]

Author: gkistanova
Date: Thu Feb 21 13:27:00 2013
New Revision: 175780

URL: http://llvm.org/viewvc/llvm-project?rev=175780&view=rev
Log:
Added lld-x86_64-darwin11 builder.

Added:
    zorg/trunk/zorg/buildbot/builders/LLDBuilder.py
Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/master.cfg

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=175780&r1=175779&r2=175780&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Feb 21 13:27:00 2013
@@ -34,6 +34,10 @@ from zorg.buildbot.builders import LLDBB
 reload(LLDBBuilder)
 from zorg.buildbot.builders import LLDBBuilder
 
+from zorg.buildbot.builders import LLDBuilder
+reload(LLDBBuilder)
+from zorg.buildbot.builders import LLDBuilder
+
 from buildbot.steps.source import SVN
 
 # Plain LLVM builders.
@@ -573,6 +577,16 @@ def _get_lldb_builders():
 #                                                   env=gcc_m32_latest_env)}
        ]
 
+# LLD builders.
+def _get_lld_builders():
+    return [
+        {'name': "lld-x86_64-darwin11",
+         'slavenames' :["as-bldslv11"],
+         'builddir':"lld-x86_64-darwin11",
+         'factory': LLDBuilder.getLLDBuildFactory(),
+         'category'   : 'lld'},
+         ]
+
 # Experimental and stopped builders
 def _get_experimental_builders():
 
@@ -639,6 +653,10 @@ def get_builders():
         b['category'] = 'polly'
         yield b
 
+    for b in _get_lld_builders():
+        b['category'] = 'lld'
+        yield b
+
     for b in _get_lldb_builders():
         b['category'] = 'lldb'
         yield b

Modified: zorg/trunk/buildbot/osuosl/master/master.cfg
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/master.cfg?rev=175780&r1=175779&r2=175780&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/master.cfg (original)
+++ zorg/trunk/buildbot/osuosl/master/master.cfg Thu Feb 21 13:27:00 2013
@@ -44,6 +44,7 @@ c['change_source'].append(LLVMPoller(pro
     "llvm-gcc-4.2",
     "compiler-rt",
     "dragonegg",
+    "lld",
     "lldb"]))
 
 #  c['change_source'].append(LLVMPoller("test-suite", "trunk"))
@@ -139,6 +140,13 @@ c['schedulers'].append(SingleBranchSched
                                 "llvm",
                                 "polly"])))
 
+c['schedulers'].append(SingleBranchScheduler(name="lld_scheduler",
+                            treeStableTimer=2*60,
+                            builderNames=get_all_for("lld"),
+                            change_filter=depends_on([
+                                "llvm",
+                                "lld"])))
+
 c['schedulers'].append(SingleBranchScheduler(name="lldb_scheduler",
                             treeStableTimer=2*60,
                             builderNames=get_all_for("lldb"),

Added: zorg/trunk/zorg/buildbot/builders/LLDBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBuilder.py?rev=175780&view=auto
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBuilder.py (added)
+++ zorg/trunk/zorg/buildbot/builders/LLDBuilder.py Thu Feb 21 13:27:00 2013
@@ -0,0 +1,77 @@
+import os
+
+import buildbot
+import buildbot.process.factory
+from buildbot.steps.source import SVN, Git from buildbot.steps.shell import Configure, ShellCommand from buildbot.process.properties import WithProperties
+
+from zorg.buildbot.builders import LNTBuilder from zorg.buildbot.builders import ClangBuilder
+
+
+def getLLDBuildFactory(
+           clean = True):
+
+    llvm_srcdir = "llvm.src"
+    llvm_objdir = "llvm.obj"
+
+    f = buildbot.process.factory.BuildFactory()
+    # Determine the build directory.
+    f.addStep(buildbot.steps.shell.SetProperty(name="get_builddir",
+                                               command=["pwd"],
+                                               property="builddir",
+                                               description="set build dir",
+                                               workdir="."))
+    # Get LLVM and Lld
+    f.addStep(SVN(name='svn-llvm',
+                  mode='update',
+                  baseURL='http://llvm.org/svn/llvm-project/llvm/',
+                  defaultBranch='trunk',
+                  workdir=llvm_srcdir))
+    f.addStep(SVN(name='svn-lld',
+                  mode='update',
+                  baseURL='http://llvm.org/svn/llvm-project/lld/',
+                  defaultBranch='trunk',
+                  workdir='%s/tools/lld' % llvm_srcdir))
+
+    # Clean directory, if requested.
+    if clean:
+        f.addStep(ShellCommand(name="rm-llvm_objdir",
+                               command=["rm", "-rf", llvm_objdir],
+                               haltOnFailure=True,
+                               description=["rm build dir", "llvm"],
+                               workdir="."))
+
+    # Create configuration files with cmake
+    f.addStep(ShellCommand(name="create-build-dir",
+                               command=["mkdir", "-p", llvm_objdir],
+                               haltOnFailure=False,
+                               description=["create build dir"],
+                               workdir="."))
+    cmakeCommand = [
+        "cmake",
+        "-DCMAKE_BUILD_TYPE=Release",
+        "-DCMAKE_CXX_FLAGS=\"-Wall -Werror -std=c++11 -stdlib=libc++ -U__STRICT_ANSI__\"",
+        "../%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",
+                               description=["cmake configure"],
+                               haltOnFailure=True,
+                               command=WithProperties(" ".join(cmakeCommand)),
+                               env={
+                                    'CXX': "clang++",
+                                    'C':   "clang"},
+                               workdir=llvm_objdir))
+    # Build Lld
+    f.addStep(ShellCommand(name="build_Lld",
+                               command=["make"],
+                               haltOnFailure=True,
+                               description=["build lld"],
+                               workdir=llvm_objdir))
+    # Test Lld
+    f.addStep(ShellCommand(name="test_lld",
+                               command=["make", "lld-test"],
+                               haltOnFailure=True,
+                               description=["test lld"],
+                               workdir=llvm_objdir))
+
+    return f