[zorg] r234967 - jenkins: Don't build examples during LTO

[Duncan P. N. Exon Smith]

Author: dexonsmith
Date: Tue Apr 14 21:00:36 2015
New Revision: 234967

URL: http://llvm.org/viewvc/llvm-project?rev=234967&view=rev
Log:
jenkins: Don't build examples during LTO

Building examples during LTO is a waste of time [1]; the point is just
to be sure that the examples build at all.  This backs off r234905 a
little.

[1]: http://lab.llvm.org:8080/green/job/llvm-stage2-cmake-RgLTO/157/

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=234967&r1=234966&r2=234967&view=diff
==============================================================================
--- zorg/trunk/test/jenkins/test_build.py (original)
+++ zorg/trunk/test/jenkins/test_build.py Tue Apr 14 21:00:36 2015
@@ -68,10 +68,10 @@
 # RUN: python %{src_root}/zorg/jenkins/build.py cmake all --debug > %t-cmake.log
 # RUN: FileCheck --check-prefix CHECK-CMAKE < %t-cmake.log %s
 # CHECK-CMAKE: '/usr/local/bin/cmake' '-G' 'Ninja'
+# CHECK-CMAKE: -DLLVM_BUILD_EXAMPLES=On
 # CHECK-CMAKE: '-DCMAKE_BUILD_TYPE=Debug'
 # CHECK-CMAKE: '-DLLVM_ENABLE_ASSERTIONS=Off'
 # CHECK-CMAKE: -DLLVM_LIT_ARGS=--xunit-xml-output=testresults.xunit.xml -v
-# CHECK-CMAKE: -DLLVM_BUILD_EXAMPLES=On
 # CHECK-CMAKE: '/usr/local/bin/ninja'
 # CHECK-CMAKE: '/usr/local/bin/ninja' 'check' 'check-clang'
 # CHECK-CMAKE: '/usr/local/bin/ninja' 'check-all'
@@ -119,6 +119,7 @@
 # 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: '-DLLVM_BUILD_EXAMPLES=Off'
 # 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=234967&r1=234966&r2=234967&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Tue Apr 14 21:00:36 2015
@@ -123,6 +123,10 @@ def cmake_builder(target):
         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"]
+        cmake_cmd += ['-DLLVM_BUILD_EXAMPLES=Off']
+    else:
+        cmake_cmd += ['-DLLVM_BUILD_EXAMPLES=On']
+
     if conf.CC():
         cmake_cmd += ['-DCMAKE_C_COMPILER=' + conf.CC(),
                       '-DCMAKE_CXX_COMPILER=' + conf.CC() + "++"]
@@ -142,9 +146,6 @@ def cmake_builder(target):
     cmake_cmd += [
         '-DLLVM_LIT_ARGS=--xunit-xml-output=testresults.xunit.xml -v']
 
-    # Build examples.
-    cmake_cmd += ['-DLLVM_BUILD_EXAMPLES=On']
-
     ninja_cmd = env + ["/usr/local/bin/ninja"]
     if conf.j_level is not None:
         ninja_cmd += ["-j", conf.j_level]