[zorg] r215758 - Attempt to fix clang-mergefunc-x86_64-freebsd buildbot.

[Galina Kistanova]

Author: gkistanova
Date: Fri Aug 15 14:21:43 2014
New Revision: 215758

URL: http://llvm.org/viewvc/llvm-project?rev=215758&view=rev
Log:
Attempt to fix clang-mergefunc-x86_64-freebsd buildbot.

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=215758&r1=215757&r2=215758&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Aug 15 14:21:43 2014
@@ -140,14 +140,10 @@ clang_x86_64_linux_xfails = [
 # Remove after http://llvm.org/bugs/show_bug.cgi?id=18089
 # and http://llvm.org/bugs/show_bug.cgi?id=18056 will be fixed and closed.
 clang_x86_64_freebsd_xfails = [
-    'LLC.MultiSource/Benchmarks/SciMark2-C/scimark2',
-    'LLC_compile.MultiSource/Benchmarks/SciMark2-C/scimark2',
     'LLC.MultiSource/Benchmarks/nbench/nbench',
     'LLC_compile.MultiSource/Benchmarks/nbench/nbench',
-    'LLC.SingleSource/Benchmarks/Misc-C++/Large/sphereflake',
-    'LLC_compile.SingleSource/Benchmarks/Misc-C++/Large/sphereflake',
-    'LLC.SingleSource/UnitTests/ms_struct_pack_layout',
-    'LLC_compile.SingleSource/UnitTests/ms_struct_pack_layout',
+    'LLC.SingleSource/Benchmarks/Misc/mandel',
+    'LLC_compile.SingleSource/Benchmarks/Misc/mandel',
 
 ]
 
@@ -306,8 +302,6 @@ def _get_clang_builders():
                                                                merge_functions=True,
                                                                make='gmake',
                                                                test=False,
-                                                               env={'CC'  : '/usr/local/bin/gcc49',
-                                                                    'CXX' : '/usr/local/bin/g++49'},
                                                                xfails=clang_x86_64_freebsd_xfails)},
 
         # Clang cross builders.