[zorg] r248530 - Disabled broken builders:

Galina Kistanova via llvm-commits llvm-commits at lists.llvm.org
Thu Sep 24 12:44:10 PDT 2015


Author: gkistanova
Date: Thu Sep 24 14:44:10 2015
New Revision: 248530

URL: http://llvm.org/viewvc/llvm-project?rev=248530&view=rev
Log:
Disabled broken builders:
        libiomp5-gcc-x86_64-linux-debian
        libiomp5-clang-x86_64-linux-debian

has been replaced by new ones:
        libomp-gcc-x86_64-linux-debian
        libomp-clang-x86_64-linux-debian

Added getLibompCMakeBuildFactory to the existing Libiomp5Builder.py.

Patch by Fedorova Vera.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.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=248530&r1=248529&r2=248530&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Sep 24 14:44:10 2015
@@ -668,21 +668,23 @@ def _get_sanitizer_builders():
 
 def _get_openmp_builders():
     return [
-        {'name': "libiomp5-gcc-x86_64-linux-debian",
+        {'name': "libomp-gcc-x86_64-linux-debian",
          'slavenames':["gribozavr4"],
-         'builddir':"libiomp5-gcc-x86_64-linux-debian",
-         'factory' : Libiomp5Builder.getLibiomp5BuildFactory(
-                         buildcompiler="gcc",
+         'builddir':"libomp-gcc-x86_64-linux-debian",
+         'factory' : Libiomp5Builder.getLibompCMakeBuildFactory(
+                         c_compiler="gcc",
+                         cxx_compiler="g++",
                          env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'}),
-         'category' : 'libiomp5'},
+         'category' : 'libomp'},
 
-        {'name': "libiomp5-clang-x86_64-linux-debian",
+        {'name': "libomp-clang-x86_64-linux-debian",
          'slavenames':["gribozavr4"],
-         'builddir':"libiomp5-clang-x86_64-linux-debian",
-         'factory' : Libiomp5Builder.getLibiomp5BuildFactory(
-                         buildcompiler="clang",
+         'builddir':"libomp-clang-x86_64-linux-debian",
+         'factory' : Libiomp5Builder.getLibompCMakeBuildFactory(
+                         c_compiler="clang",
+                         cxx_compiler="clang++",
                          env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'}),
-         'category' : 'libiomp5'},
+         'category' : 'libomp'},
         ]
 
 def _get_libcxx_builders():

Modified: zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py?rev=248530&r1=248529&r2=248530&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py Thu Sep 24 14:44:10 2015
@@ -7,7 +7,11 @@ from buildbot.steps.shell import ShellCo
 from buildbot.steps.shell import WarningCountingShellCommand
 from buildbot.process.properties import WithProperties
 
-def getLibiomp5BuildFactory(clean=True, env=None, buildcompiler="gcc"):
+import zorg.buildbot.commands as commands
+import zorg.buildbot.commands.LitTestCommand as lit_test_command
+
+
+def getLibompCMakeBuildFactory(clean=True, env=None, test=True, c_compiler="gcc", cxx_compiler="g++"):
 
     # Prepare environmental variables. Set here all env we want everywhere.
     merged_env = {
@@ -18,19 +22,12 @@ def getLibiomp5BuildFactory(clean=True,
         merged_env.update(env)
 
     openmp_srcdir = "openmp.src"
+    openmp_builddir = "openmp.build"
 
     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',
+    # Get libomp
+    f.addStep(SVN(name='svn-libomp',
                   mode='update',
                   baseURL='http://llvm.org/svn/llvm-project/openmp/',
                   defaultBranch='trunk',
@@ -38,23 +35,39 @@ def getLibiomp5BuildFactory(clean=True,
 
     # Clean directory, if requested.
     if clean:
-        f.addStep(ShellCommand(name="make clean",
-                               command=["make", "clean"],
-                               haltOnFailure=True,
-                               description=["make clean"],
-                               workdir='%s/runtime' % openmp_srcdir,
+        f.addStep(ShellCommand(name="clean",
+                               command=["rm", "-rf",openmp_builddir],
+                               warnOnFailure=True,
+                               description=["clean"],
+                               workdir='.',
                                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"],
+    # CMake
+    f.addStep(ShellCommand(name='cmake',
+                           command=["cmake", "../"+openmp_srcdir,
+                                    "-DCMAKE_C_COMPILER="+c_compiler,
+                                    "-DCMAKE_CXX_COMPILER="+cxx_compiler],
                            haltOnFailure=True,
-                           command=WithProperties(" ".join(makeCommand)),
-                           workdir='%s/runtime' % openmp_srcdir,
+                           description='cmake',
+                           workdir=openmp_builddir,
                            env=merged_env))
+
+    # Make
+    f.addStep(WarningCountingShellCommand(name='make build',
+                                          command=['make'],
+                                          haltOnFailure=True,
+                                          description='make build',
+                                          workdir=openmp_builddir,
+                                          env=merged_env))
+
+    # Test, if requested
+    if test:
+        f.addStep(lit_test_command.LitTestCommand(name='make check-libomp',
+                                                  command=['make', 'check-libomp'],
+                                                  haltOnFailure=True,
+                                                  description=["make check-libomp"],
+                                                  descriptionDone=["build checked"],
+                                                  workdir=openmp_builddir,
+                                                  env=merged_env))
+
     return f




More information about the llvm-commits mailing list