[zorg] r204365 - Added new builders libiomp5-gcc-x86_64-linux-debian, libiomp5-clang-x86_64-linux-debian, slave and buildfactory for them.

[Galina Kistanova]

Author: gkistanova
Date: Thu Mar 20 13:10:11 2014
New Revision: 204365

URL: http://llvm.org/viewvc/llvm-project?rev=204365&view=rev
Log:
Added new builders libiomp5-gcc-x86_64-linux-debian, libiomp5-clang-x86_64-linux-debian, slave and buildfactory for them.
Patch by Miloserdova Vera!

Added:
    zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py
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=204365&r1=204364&r2=204365&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Mar 20 13:10:11 2014
@@ -50,6 +50,10 @@ from zorg.buildbot.builders import Sanit
 reload(SanitizerBuilderII)
 from zorg.buildbot.builders import SanitizerBuilderII
 
+from zorg.buildbot.builders import Libiomp5Builder
+reload(Libiomp5Builder)
+from zorg.buildbot.builders import Libiomp5Builder
+
 from buildbot.steps.source import SVN
 
 # Plain LLVM builders.
@@ -733,6 +737,18 @@ def _get_experimental_builders():
          'builddir':"clang-openbsd",
          'factory' : ClangBuilder.getClangBuildFactory(stage1_config='Release+Asserts'),
          'category' : 'clang'},
+
+        {'name': "libiomp5-gcc-x86_64-linux-debian",
+         'slavenames':["gribozavr4"],
+         'builddir':"libiomp5-gcc-x86_64-linux-debian",
+         'factory' : Libiomp5Builder.getLibiomp5BuildFactory(buildcompiler="gcc"),
+         'category' : 'libiomp5'},
+
+        {'name': "libiomp5-clang-x86_64-linux-debian",
+         'slavenames':["gribozavr4"],
+         'builddir':"libiomp5-clang-x86_64-linux-debian",
+         'factory' : Libiomp5Builder.getLibiomp5BuildFactory(buildcompiler="clang"),
+         'category' : 'libiomp5'},
         ]
 
 def get_builders():

Added: zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py?rev=204365&view=auto
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py (added)
+++ zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py Thu Mar 20 13:10:11 2014
@@ -0,0 +1,55 @@
+import os
+
+import buildbot
+import buildbot.process.factory
+from buildbot.steps.source import SVN
+from buildbot.steps.shell import ShellCommand
+from buildbot.steps.shell import WarningCountingShellCommand
+from buildbot.process.properties import WithProperties
+
+def getLibiomp5BuildFactory(clean=True, env=None, buildcompiler="gcc"):
+
+    # Prepare environmental variables. Set here all env we want everywhere.
+    merged_env = {
+        'TERM' : 'dumb' # Make sure Clang doesn't use color escape sequences.
+                 }
+
+    f = buildbot.process.factory.BuildFactory()
+
+    # Determine the build directory.
+    f.addStep(buildbot.steps.shell.SetProperty(name="get_builddir",
+                                               command=["pwd"],
+                                               property="builddir",
+                                               description="set build dir",
+                                               workdir=".",
+                                               env=merged_env))
+
+    # Get libiomp5
+    f.addStep(SVN(name='svn-libiomp5',
+                  mode='update',
+                  baseURL='http://llvm.org/svn/llvm-project/openmp',
+                  defaultBranch='trunk',
+                  workdir='.'))
+
+    # Clean directory, if requested.
+    if clean:
+        f.addStep(ShellCommand(name="make clean",
+                               command=["make", "clean"],
+                               haltOnFailure=True,
+                               description=["make clean"],
+                               workdir="runtime",
+                               env=merged_env))
+
+    makeCommand = [
+        "make",
+        "compiler=\"%s\"" % buildcompiler]
+
+    # Note: ShellCommand does not pass the params with special symbols right.
+    # The " ".join is a workaround for this bug.
+    f.addStep(ShellCommand(name="make build",
+                           description=["make build"],
+                           haltOnFailure=True,
+                           command=WithProperties(" ".join(makeCommand)),
+                           workdir='runtime',
+                           env=merged_env))
+    return f