<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Aug 1, 2014 at 11:58 AM, Galina Kistanova <span dir="ltr"><<a href="mailto:gkistanova@gmail.com" target="_blank">gkistanova@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: gkistanova<br>
Date: Fri Aug  1 13:58:57 2014<br>
New Revision: 214540<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=214540&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=214540&view=rev</a><br>
Log:<br>
Fixed mergefunc builder configure; added lldb builder for FreeBSD.<br>
<br>
Modified:<br>
    zorg/trunk/buildbot/osuosl/master/config/builders.py<br>
<br>
Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=214540&r1=214539&r2=214540&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=214540&r1=214539&r2=214540&view=diff</a><br>
==============================================================================<br>
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)<br>
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Aug  1 13:58:57 2014<br>
@@ -132,10 +132,10 @@ clang_x86_64_linux_xfails = [<br>
     'LLC_compile.SingleSource/UnitTests/Vector/SSE/sse.stepfft',<br>
 ]<br>
<br>
-# TODO: The following tests marked as expected failures on FreeBSD 9 temporarily.<br>
+# TODO: The following tests marked as expected failures on FreeBSD temporarily.<br>
 # Remove after <a href="http://llvm.org/bugs/show_bug.cgi?id=18089" target="_blank">http://llvm.org/bugs/show_bug.cgi?id=18089</a><br>
 # and <a href="http://llvm.org/bugs/show_bug.cgi?id=18056" target="_blank">http://llvm.org/bugs/show_bug.cgi?id=18056</a> will be fixed and closed.<br>
-clang_x86_64_freeBSD9_xfails = [<br>
+clang_x86_64_freebsd_xfails = [<br>
     'LLC.MultiSource/Benchmarks/SciMark2-C/scimark2',<br>
     'LLC_compile.MultiSource/Benchmarks/SciMark2-C/scimark2',<br>
     'LLC.MultiSource/Benchmarks/nbench/nbench',<br>
@@ -294,17 +294,17 @@ def _get_clang_builders():<br>
                                                                test=False,<br>
                                                                xfails=clang_x86_64_linux_xfails)},<br>
<br>
-         {'name': "clang-mergefunc-x86_64-freeBSD9.2",<br>
+         {'name': "clang-mergefunc-x86_64-freebsd",<br>
           'slavenames':["as-bldslv5"],<br>
-         'builddir':"x86_64-freeBSD9.2",<br>
-         'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='x86_64-unknown-freebsd9.2',<br>
+         'builddir':"clang-mergefunc-x86_64-freebsd",<br>
+         'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='x86_64-unknown-freebsd10.0',<br>
                                                                stage1_config='Release+Asserts',<br>
                                                                merge_functions=True,<br>
                                                                make='gmake',<br>
                                                                test=False,<br>
-                                                               env={'CC'  : '/usr/local/bin/gcc47',<br>
-                                                                    'CXX' : '/usr/local/bin/g++47'},<br>
-                                                               xfails=clang_x86_64_freeBSD9_xfails)},<br>
+                                                               env={'CC'  : '/usr/local/bin/gcc49',<br>
+                                                                    'CXX' : '/usr/local/bin/g++49'},<br>
+                                                               xfails=clang_x86_64_freebsd_xfails)},<br>
<br>
         # Clang cross builders.<br>
         {'name' : "clang-x86_64-darwin13-cross-mingw32",<br>
@@ -550,6 +550,10 @@ def _get_lldb_builders():<br>
          'builddir': "build.lldb-x86_64-darwin12",<br>
          'factory': LLDBBuilder.getLLDBxcodebuildFactory()},<br>
<br>
+        {'name': "lldb-x86_64-freebsd",<br>
+         'slavenames': ["as-bldslv5"],<br>
+         'builddir': "lldb-x86_64-freebsd",<br>
+         'factory': LLDBBuilder.getLLDBxcodebuildFactory()},<br>
        ]<br>
<br>
 # Offline.<br>
@@ -579,9 +583,9 @@ def _get_lld_builders():<br>
          'factory': LLDBuilder.getLLDWinBuildFactory(),<br>
          'category'   : 'lld'},<br>
<br>
-        {'name': "lld-x86_64-freeBSD",<br>
+        {'name': "lld-x86_64-freebsd",<br>
          'slavenames' :["as-bldslv5"],<br>
-         'builddir':"lld-x86_64-freeBSD",<br>
+         'builddir':"lld-x86_64-freebsd",<br></blockquote><div><br>Not sure who owns this builder (who was this patch provided/requested by?) but this builder doesn't seem to have passed in several hundred builds over the last week & a half (not sure how much further back the failures go - it's been failing since recorded history of those couple of hundred builds, at least).<br><br>Can we disable this until someone cares about it enough to make/keep it green?<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
          'factory': LLDBuilder.getLLDBuildFactory(jobs=32,<br>
                                                   extra_configure_args=['-DCMAKE_EXE_LINKER_FLAGS=-lcxxrt'],<br>
                                                   env={'CXXFLAGS' : "-std=c++11 -stdlib=libc++"}),<br>
@@ -609,9 +613,9 @@ def _get_sanitizer_builders():<br>
           #                                   buildWithSanitizerOptions=['-fsanitize=address'],<br>
           #                                   env={'PATH':'/usr/local/bin:/usr/bin:/bin'})},<br>
<br>
-          {'name': "sanitizer_x86_64-freeBSD9.2",<br>
+          {'name': "sanitizer_x86_64-freebsd",<br>
            'slavenames':["as-bldslv5"],<br>
-           'builddir':"sanitizer_x86_64-freeBSD9.2",<br>
+           'builddir':"sanitizer_x86_64-freebsd",<br>
            'factory' : SanitizerBuilderII.getSanitizerBuildFactoryII(<br>
                                           clean=True,<br>
                                           sanitizers=['sanitizer','lsan','msan','tsan','ubsan','dfsan'],<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>