[zorg] r191456 - Added new MergeFunctions custom builder clang-x86_64-freeBSD9.2.

[Galina Kistanova]

Author: gkistanova
Date: Thu Sep 26 15:42:52 2013
New Revision: 191456

URL: http://llvm.org/viewvc/llvm-project?rev=191456&view=rev
Log:
Added new MergeFunctions custom builder clang-x86_64-freeBSD9.2.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.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=191456&r1=191455&r2=191456&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Sep 26 15:42:52 2013
@@ -312,6 +312,14 @@ def _get_clang_builders():
                                                                test=False,
                                                                xfails=clang_x86_64_linux_xfails)},
 
+         {'name': "clang-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,
+                                                               test=False)},
+
         # Clang cross builders.
         {'name' : "clang-x86_64-darwin11-cross-mingw32",
          'slavenames' :["as-bldslv11"],

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=191456&r1=191455&r2=191456&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Thu Sep 26 15:42:52 2013
@@ -40,7 +40,8 @@ def getClangBuildFactory(
             checkout_compiler_rt=False,
             run_gdb=False,
             run_modern_gdb=False,
-            run_gcc=False):
+            run_gcc=False,
+            merge_functions=False):
     # Prepare environmental variables. Set here all env we want everywhere.
     merged_env = {
         'TERM' : 'dumb' # Make sure Clang doesn't use color escape sequences.
@@ -141,6 +142,23 @@ def getClangBuildFactory(
                           defaultBranch='trunk',
                           workdir='%s/projects/compiler-rt' % llvm_srcdir))
 
+    # Revert and apply patch mergeFunctions in required
+    if merge_functions:
+        f.addStep(ShellCommand(name="revert_patch_MergeFunctions",
+                               command=["svn", "-R", "revert", '.'],
+                               haltOnFailure=True,
+                               description=["revert patch MergeFunctions"],
+                               workdir='%s/tools/clang' % llvm_srcdir,
+                               env=merged_env))
+
+    if merge_functions:
+        f.addStep(ShellCommand(name="patch_MergeFunctions",
+                               command=["patch", "-Np0", "-i", '../../utils/Misc/mergefunctions.clang.svn.patch'],
+                               haltOnFailure=True,
+                               description=["patch MergeFunctions"],
+                               workdir='%s/tools/clang' % llvm_srcdir,
+                               env=merged_env))
+
     # Clean up llvm (stage 1); unless in-dir.
     if clean and llvm_srcdir != llvm_1_objdir:
         f.addStep(ShellCommand(name="rm-llvm.obj.stage1",