[zorg] r224081 - Add new buildslave and -fno-exceptions and -fno-rtti builders

[Eric Fiselier]

Author: ericwf
Date: Thu Dec 11 17:47:36 2014
New Revision: 224081

URL: http://llvm.org/viewvc/llvm-project?rev=224081&view=rev
Log:
Add new buildslave and -fno-exceptions and -fno-rtti builders

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/config/slaves.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=224081&r1=224080&r2=224081&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Dec 11 17:47:36 2014
@@ -725,8 +725,7 @@ def _get_libcxx_builders():
                                'LIBCXXABI_ENABLE_THREADS': 'OFF'}),
          'category': 'libcxx'},
 
-        # EricWF's builders. A default configuration build
-        # As well as builders for c++03 and c++14
+        # EricWF's builders on ericwf-buildslave
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu',
          'slavenames': ['ericwf-buildslave'],
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu',
@@ -780,6 +779,26 @@ def _get_libcxx_builders():
             cmake_extra_opts={'LLVM_USE_SANITIZER': 'Undefined'}),
         'category': 'libcxx'},
 
+        # EricWF's builders on ericwf-buildslave2
+        {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-noexceptions',
+         'slavenames': ['ericwf-buildslave2'],
+         'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-noexceptions',
+         'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
+            env={'PATH': '/usr/local/bin:/usr/bin:/bin',
+                 'CC': 'clang', 'CXX': 'clang++'},
+            cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'}),
+        'category': 'libcxx'},
+
+        {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-nortti',
+         'slavenames': ['ericwf-buildslave2'],
+         'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-noexceptions',
+         'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
+            env={'PATH': '/usr/local/bin:/usr/bin:/bin',
+                 'CC': 'clang', 'CXX': 'clang++'},
+            cmake_extra_opts={'LIBCXX_ENABLE_RTTI': 'OFF'}),
+        'category': 'libcxx'},
+
+        # EricWF's builders on ericwf-osx-slave
         {'name': 'libcxx-libcxxabi-x86_64-apple-darwin14-system-clang',
          'slavenames': ['ericwf-osx-slave'],
          'builddir' : 'libcxx-libcxxabi-x86_64-apple-darwin14-system-clang',

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=224081&r1=224080&r2=224081&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Thu Dec 11 17:47:36 2014
@@ -163,6 +163,8 @@ def get_build_slaves():
 
         # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU E5-1650 0 @ 3.20GHz
         create_slave("ericwf-buildslave", properties={'jobs': 4}, max_builds=2),
+        # Ubuntu 14.10 x86_64, Intel(R) Xeon(R) CPU E3-1245 V2 @ 3.40GHz
+        create_slave('ericwf-buildslave2', properties={'jobs': 4}, max_builds=2),
         # OS X 10.10 x86_64, Intel Core 2 Duo @ 2.40GHz
         create_slave("ericwf-osx-slave", properties={'jobs': 2}, max_builds=1),
         # Defunct.