[zorg] r259080 - Fixed previous commit for builder clang-x86_64-debian-fast.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Thu Jan 28 13:28:47 2016
New Revision: 259080

URL: http://llvm.org/viewvc/llvm-project?rev=259080&view=rev
Log:
Fixed previous commit for builder clang-x86_64-debian-fast.

+

Switched clang-atom-d525-fedora-rel and clang-atom-d525-fedora buildbots from configure+make to cmake+ninja.
Updated Libiomp5Builder.py to switch clang/llvm utils build from make to ninja.
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=259080&r1=259079&r2=259080&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Jan 28 13:28:47 2016
@@ -107,11 +107,11 @@ def _get_clang_fast_builders():
         {'name': "clang-x86_64-debian-fast",
          'slavenames':["gribozavr4"],
          'builddir':"clang-x86_64-debian-fast",
-         'factory': ClangBuilder.getClangBuildFactory(
+         'factory': ClangAndLLDBuilder.getClangAndLLDBuildFactory(
                      withLLD=False,
                      prefixCommand=None, # This is a designated builder, so no need to be nice.
                      env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin',
-                         'CC': 'ccache clang', 'CXX': 'ccache clang++', 'CCACHE_CPP2': 'yes'}),
+                         'CC': 'ccache clang', 'CXX': 'ccache clang++', 'CCACHE_CPP2': 'yes'})},
 
         {'name': "llvm-clang-lld-x86_64-debian-fast",
          'slavenames':["gribozavr4"],
@@ -148,8 +148,15 @@ def _get_clang_builders():
         {'name': "clang-atom-d525-fedora-rel",
          'slavenames':["atom1-buildbot"],
          'builddir':"clang-atom-d525-fedora-rel",
-         'factory' : ClangBuilder.getClangBuildFactory(stage1_config='Release+Asserts',
-                                                       extra_configure_args=['--with-intel-jitevents'])},
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                       clean=True,
+                       checkout_compiler_rt=False,
+                       useTwoStage=False,
+                       stage1_config='Release',
+                       test=True,
+                       testStage1=True,
+                       extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON',
+                                         '-DLLVM_USE_INTEL_JITEVENTS=TRUE'])},
 
         # Cortex-A15 LNT test-suite in Benchmark mode
         # FIXME: Move this to CMake (see below)
@@ -898,8 +905,15 @@ def _get_experimental_scheduled_builders
         {'name': "clang-atom-d525-fedora",
          'slavenames':["atom-buildbot"],
          'builddir':"clang-atom-d525-fedora",
-         'factory' : ClangBuilder.getClangBuildFactory(extra_configure_args=["--enable-shared",
-                                                                             "--with-intel-jitevents"]),
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                       clean=True,
+                       checkout_compiler_rt=False,
+                       useTwoStage=False,
+                       stage1_config='Debug',
+                       test=True,
+                       testStage1=True,
+                       extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON',
+                                         '-DLLVM_USE_INTEL_JITEVENTS=TRUE']),
          'category' : 'clang'},
 
         {'name' : "clang-bpf-build",

Modified: zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py?rev=259080&r1=259079&r2=259080&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py Thu Jan 28 13:28:47 2016
@@ -62,6 +62,7 @@ def getLibompCMakeBuildFactory(clean=Tru
     # CMake llvm
     f.addStep(ShellCommand(name='cmake llvm',
                            command=["cmake", "../"+llvm_srcdir,
+                                    "-G Ninja",
                                     "-DCMAKE_C_COMPILER="+c_compiler,
                                     "-DCMAKE_CXX_COMPILER="+cxx_compiler],
                            haltOnFailure=True,
@@ -72,14 +73,14 @@ def getLibompCMakeBuildFactory(clean=Tru
     # Make clang build or just llvm utils build
     if c_compiler == "clang": 
         f.addStep(WarningCountingShellCommand(name='make clang build',
-                                              command=['make', '-j8'],
+                                              command=['ninja'],
                                               haltOnFailure=True,
                                               description='make clang build',
                                               workdir=llvm_builddir,
                                               env=merged_env))
     else:
         f.addStep(WarningCountingShellCommand(name='make llvm utils build',
-                                              command=['make', 'LLVMX86Utils', '-j8'],
+                                              command=['ninja', 'LLVMX86Utils'],
                                               haltOnFailure=True,
                                               description='make llvm utils build',
                                               workdir=llvm_builddir,