[zorg] r271179 - [libcxx] Add use-libunwind x86_64 builders to buildbot

[Asiri Rathnayake via llvm-commits]

Author: asiri
Date: Sun May 29 05:01:38 2016
New Revision: 271179

URL: http://llvm.org/viewvc/llvm-project?rev=271179&view=rev
Log:
[libcxx] Add use-libunwind x86_64 builders to buildbot

Currently, only the ARM libcxx builder seems to test libunwind
(-DLIBCXXABI_USE_LLVM_UNWINDER=ON cmake option).

This patch adds two x86_64 builders to do the same. Some minor
cleanups too.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.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=271179&r1=271178&r2=271179&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sun May 29 05:01:38 2016
@@ -848,6 +848,7 @@ def _get_openmp_builders():
 
 def _get_libcxx_builders():
     return [
+        # gribozavr's builders on gribozavr4 
         {'name': 'libcxx-libcxxabi-x86_64-linux-debian',
          'slavenames': ['gribozavr4'],
          'builddir': 'libcxx-libcxxabi-x86_64-linux-debian',
@@ -855,7 +856,6 @@ def _get_libcxx_builders():
              env={'CC': 'clang', 'CXX': 'clang++'}),
          'category': 'libcxx'},
 
-        # x86_64 -fno-exceptions libcxx builder
         {'name': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
          'slavenames': ['gribozavr4'],
          'builddir': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
@@ -864,6 +864,14 @@ def _get_libcxx_builders():
              cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'}),
          'category': 'libcxx'},
 
+        {'name': 'libcxx-libcxxabi-libunwind-x86_64-linux-debian',
+         'slavenames': ['gribozavr4'],
+         'builddir': 'libcxx-libcxxabi-libunwind-x86_64-linux-debian',
+         'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
+             env={'CC': 'clang', 'CXX': 'clang++'},
+             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON'}),
+         'category': 'libcxx'},
+
         {'name': 'libcxx-libcxxabi-singlethreaded-x86_64-linux-debian',
          'slavenames': ['gribozavr4'],
          'builddir': 'libcxx-libcxxabi-singlethreaded-x86_64-linux-debian',
@@ -932,6 +940,15 @@ def _get_libcxx_builders():
             lit_extra_opts={'std':'c++1z'}),
         'category': 'libcxx'},
 
+        {'name': 'libcxx-libcxxabi-libunwind-x86_64-linux-ubuntu',
+         'slavenames': ['ericwf-buildslave2'],
+         'builddir' : 'libcxx-libcxxabi-libunwind-x86_64-linux-ubuntu',
+         'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
+            env={'PATH': '/usr/local/bin:/usr/bin:/bin',
+                 'CC': 'clang', 'CXX': 'clang++'},
+            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON'}),
+        'category': 'libcxx'},
+
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-tsan',
          'slavenames': ['ericwf-buildslave2'],
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-tsan',
@@ -970,7 +987,7 @@ def _get_libcxx_builders():
             # FIXME: there should be a way to merge autodetected with user-defined linker flags
             # See: libcxxabi/test/lit.cfg
             lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.6.0/lib/linux -lclang_rt.builtins-arm"'},
-            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'True',
+            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a15',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15'})},
     ]