[zorg] r196813 - Patch by Mikael Lyngvig!

[Galina Kistanova]

Author: gkistanova
Date: Mon Dec  9 14:41:04 2013
New Revision: 196813

URL: http://llvm.org/viewvc/llvm-project?rev=196813&view=rev
Log:
Patch by Mikael Lyngvig!
Added new builder lld-powerpc-linux-debian and slave for it.
Added env to LLDBuildFactory:
                   'C'    : "clang",
                   'CXX'  : "clang++

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=196813&r1=196812&r2=196813&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Dec  9 14:41:04 2013
@@ -651,6 +651,17 @@ def _get_lld_builders():
          'factory': LLDBuilder.getLLDBuildFactory(jobs=32),
          'category'   : 'lld'},
 
+        {'name': "lld-powerpc-linux-debian",
+         'slavenames' :["mily-mini-1"],
+         'builddir': "lld-powerpc-linux-debian",
+         'factory': LLDBuilder.getLLDBuildFactory(clean=True,
+                                                  jobs=2, 
+                                                  env={ 
+                                                      'CC' : 'ccache gcc-4.8', 
+                                                      'CXX': 'ccache g++-4.8',
+                                                      'CCACHE_CPP2' : 'yes',
+                                                      'LD' : 'ld.gold'}),
+          'category' : 'lld'},
          ]
 
 # Sanitizer builders.

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=196813&r1=196812&r2=196813&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Mon Dec  9 14:41:04 2013
@@ -242,6 +242,9 @@ def get_build_slaves():
         create_slave("mily-odroid-xu-1", properties={'jobs': 4}, max_builds=1),
         create_slave("linaro-odroidxu-01", properties={'jobs' : 4}, max_builds=1),
 
+        # Debian Linux Mac Mini PowerPC @ 1.25 GHz 1 GB RAM 30 GB HD
+        create_slave("mily-mini-1", properties={'jobs' : 1}, max_builds=1),
+
         # Defunct.
         # Pentium Dual CPU T3400 @ 2.1GHz
         #create_slave("dumitrescu1", 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=196813&r1=196812&r2=196813&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBuilder.py Mon Dec  9 14:41:04 2013
@@ -8,7 +8,17 @@ from buildbot.process.properties import
 
 def getLLDBuildFactory(
            clean = True,
-           jobs="%(jobs)s"):
+           jobs  = "%(jobs)s",
+           env   = {}):
+
+    # Prepare environmental variables. Set here all env we want everywhere.
+    merged_env = {
+                   'C'    : "clang",
+                   'CXX'  : "clang++",
+                   'TERM' : 'dumb'     # Be cautious and disable color output from all tools.
+                 }
+    if env is not None:
+        merged_env.update(env)  # Overwrite pre-set items with the given ones, so user can set anything.
 
     llvm_srcdir = "llvm.src"
     llvm_objdir = "llvm.obj"
@@ -19,6 +29,7 @@ def getLLDBuildFactory(
                                                command=["pwd"],
                                                property="builddir",
                                                description="set build dir",
+                                               env=merged_env,
                                                workdir="."))
     # Get LLVM and Lld
     f.addStep(SVN(name='svn-llvm',
@@ -57,9 +68,7 @@ def getLLDBuildFactory(
                                description=["cmake configure"],
                                haltOnFailure=True,
                                command=WithProperties(" ".join(cmakeCommand)),
-                               env={
-                                    'CXX': "clang++",
-                                    'C':   "clang"},
+                               env=merged_env,
                                workdir=llvm_objdir))
     # Build Lld
     f.addStep(ShellCommand(name="build_Lld",
@@ -67,12 +76,14 @@ def getLLDBuildFactory(
                                         'make', WithProperties("-j%s" % jobs)],
                                haltOnFailure=True,
                                description=["build lld"],
+                               env=merged_env,
                                workdir=llvm_objdir))
     # Test Lld
     f.addStep(ShellCommand(name="test_lld",
                                command=["make", "lld-test"],
                                haltOnFailure=True,
                                description=["test lld"],
+                               env=merged_env,
                                workdir=llvm_objdir))
 
     return f