[zorg] r234054 - jenkins: Teach cmake builder to limit the number of link jobs

Justin Bogner mail at justinbogner.com
Fri Apr 3 14:07:05 PDT 2015


Author: bogner
Date: Fri Apr  3 16:07:05 2015
New Revision: 234054

URL: http://llvm.org/viewvc/llvm-project?rev=234054&view=rev
Log:
jenkins: Teach cmake builder to limit the number of link jobs

Modified:
    zorg/trunk/test/jenkins/test_build.py
    zorg/trunk/zorg/jenkins/build.py

Modified: zorg/trunk/test/jenkins/test_build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/test/jenkins/test_build.py?rev=234054&r1=234053&r2=234054&view=diff
==============================================================================
--- zorg/trunk/test/jenkins/test_build.py (original)
+++ zorg/trunk/test/jenkins/test_build.py Fri Apr  3 16:07:05 2015
@@ -113,5 +113,11 @@
 # RUN: cd %t.SANDBOX; python %{src_root}/zorg/jenkins/build.py derive-llvm+clang
 # RUN: cd %t.SANDBOX; python %{src_root}/zorg/jenkins/build.py derive-llvm
 
-# RUN: python %{src_root}/zorg/jenkins/build.py cmake all --lto
+# RUN: python %{src_root}/zorg/jenkins/build.py cmake all --lto > %t-cmake-lto.log
+# RUN: FileCheck --check-prefix CHECK-CMAKE < %t-cmake.log %s
+# CHECK-CMAKELTO: '/usr/local/bin/cmake' '-G' 'Ninja'
+# CHECK-CMAKELTO: '-DCMAKE_C_FLAGS=-flto' '-DCMAKE_CXX_FLAGS=-flto'
+# CHECK-CMAKELTO: '-DLLVM_PARALLEL_LINK_JOBS=1'
+# CHECK-CMAKELTO: '-DCMAKE_BUILD_TYPE=Release'
+
 # RUN: python %{src_root}/zorg/jenkins/build.py cmake all --cmake-type=RelWithDebugInfo

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=234054&r1=234053&r2=234054&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Fri Apr  3 16:07:05 2015
@@ -121,6 +121,8 @@ def cmake_builder(target):
                        conf.srcdir()]
     if conf.lto:
         cmake_cmd += ["-DCMAKE_C_FLAGS=-flto", "-DCMAKE_CXX_FLAGS=-flto"]
+        # TODO: We limit LTO links to 1. Should this be configurable?
+        cmake_cmd += ["-DLLVM_PARALLEL_LINK_JOBS=1"]
     if conf.CC():
         cmake_cmd += ['-DCMAKE_C_COMPILER=' + conf.CC(),
                       '-DCMAKE_CXX_COMPILER=' + conf.CC() + "++"]





More information about the llvm-commits mailing list