[llvm-commits] [zorg] r142925 - in /zorg/trunk/buildbot/osuosl/master: config/builders.py master.cfg

[Peter Collingbourne]

Author: pcc
Date: Tue Oct 25 09:38:59 2011
New Revision: 142925

URL: http://llvm.org/viewvc/llvm-project?rev=142925&view=rev
Log:
Add LLDB builders for osuosl

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=142925&r1=142924&r2=142925&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Oct 25 09:38:59 2011
@@ -26,6 +26,10 @@
 reload(PollyBuilder)
 from zorg.buildbot.builders import PollyBuilder
 
+from zorg.buildbot.builders import LLDBBuilder
+reload(LLDBBuilder)
+from zorg.buildbot.builders import LLDBBuilder
+
 from buildbot.steps.source import SVN
 from zorg.buildbot.commands.ClangTestCommand import ClangTestCommand
 
@@ -266,6 +270,30 @@
          'factory': PollyBuilder.getPollyBuildFactory()}
        ]
 
+# LLDB builders.
+def _get_lldb_builders():
+    gcc_latest_env = {
+        'LD_LIBRARY_PATH': '/opt/cfarm/mpc-latest/lib:/opt/cfarm/mpfr-latest/lib:/opt/cfarm/gmp-latest/lib',
+        'CC':  '/opt/cfarm/gcc-core-latest/bin/gcc',
+        'CXX': '/opt/cfarm/gcc-core-latest/bin/g++'}
+
+    gcc_m32_latest_env = gcc_latest_env.copy()
+    gcc_m32_latest_env['CC'] += ' -m32'
+    gcc_m32_latest_env['CXX'] += ' -m32'
+
+    return [
+        {'name': "lldb-x86_64-linux",
+         'slavenames': ["gcc14"],
+         'builddir': "lldb-x86_64",
+         'factory': LLDBBuilder.getLLDBBuildFactory(triple="x86_64-pc-linux-gnu",
+                                                    env=gcc_latest_env)},
+        {'name': "lldb-i686-debian",
+         'slavenames': ["gcc15"],
+         'builddir': "lldb-i686-debian",
+         'factory': LLDBBuilder.getLLDBBuildFactory(triple="i686-pc-linux-gnu",
+                                                    env=gcc_m32_latest_env)}
+       ]
+
 def _get_experimental_builders():
     return [
 
@@ -763,6 +791,10 @@
         b['category'] = 'polly'
         yield b
 
+    for b in _get_lldb_builders():
+        b['category'] = 'lldb'
+        yield b
+
     for b in _get_experimental_builders():
         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=142925&r1=142924&r2=142925&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/master.cfg (original)
+++ zorg/trunk/buildbot/osuosl/master/master.cfg Tue Oct 25 09:38:59 2011
@@ -51,6 +51,7 @@
   c['change_source'].append(LLVMPoller("llvm-gcc-4.2/trunk"))
   c['change_source'].append(LLVMPoller("compiler-rt/trunk"))
   c['change_source'].append(LLVMPoller("dragonegg/trunk"))
+  c['change_source'].append(LLVMPoller("lldb/trunk"))
 #  c['change_source'].append(LLVMPoller("test-suite/trunk"))
 
 ####### BUILDERS