[zorg] r194597 - Return clang-mergefunc-x86_64-freeBSD9.2 builder back to work.

[Galina Kistanova]

Author: gkistanova
Date: Wed Nov 13 13:12:48 2013
New Revision: 194597

URL: http://llvm.org/viewvc/llvm-project?rev=194597&view=rev
Log:
Return clang-mergefunc-x86_64-freeBSD9.2 builder back to work.

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=194597&r1=194596&r2=194597&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Nov 13 13:12:48 2013
@@ -291,14 +291,14 @@ def _get_clang_builders():
                                                                test=False,
                                                                xfails=clang_x86_64_linux_xfails)},
 
-#         {'name': "clang-mergefunc-x86_64-freeBSD9.2",
-#          'slavenames':["as-bldslv5"],
-#         'builddir':"x86_64-freeBSD9.2",
-#         'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='x86_64-unknown-freebsd9.2',
-#                                                               stage1_config='Release+Asserts',
-#                                                               merge_functions=True,
-#                                                               make='gmake',
-#                                                               test=False)},
+         {'name': "clang-mergefunc-x86_64-freeBSD9.2",
+          'slavenames':["as-bldslv5"],
+         'builddir':"x86_64-freeBSD9.2",
+         'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='x86_64-unknown-freebsd9.2',
+                                                               stage1_config='Release+Asserts',
+                                                               merge_functions=True,
+                                                               make='gmake',
+                                                               test=False)},
 
         # Clang cross builders.
         {'name' : "clang-x86_64-darwin11-cross-mingw32",