[zorg] r279791 - Make CMake builds upload artifacts too

[Chris Matthews via llvm-commits]

Author: cmatthews
Date: Thu Aug 25 18:29:30 2016
New Revision: 279791

URL: http://llvm.org/viewvc/llvm-project?rev=279791&view=rev
Log:
Make CMake builds upload artifacts too

The cmake builds did not upload their artifacts, that was a error.

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=279791&r1=279790&r2=279791&view=diff
==============================================================================
--- zorg/trunk/test/jenkins/test_build.py (original)
+++ zorg/trunk/test/jenkins/test_build.py Thu Aug 25 18:29:30 2016
@@ -144,8 +144,8 @@
 # CHECK-CMAKE-2-TESTS: '/usr/local/bin/cmake' '-G' 'Ninja'
 # CHECK-CMAKE-2-TESTS: '-DLLVM_LIT_ARGS=--xunit-xml-output=testresults.xunit.xml -v -j 2'
 
-# RUN: python %{src_root}/zorg/jenkins/build.py cmake all --cmake-type=RelWithDebugInfo
-
+# RUN: python %{src_root}/zorg/jenkins/build.py cmake all --cmake-type=RelWithDebugInfo | FileCheck --check-prefix CHECK-CMAKE-UPLOADS %s
+# CHECK-CMAKE-UPLOADS: @@@ Uploading Artifact @@@
 
 # RUN: python %{src_root}/zorg/jenkins/build.py static-analyzer-benchmarks | FileCheck --check-prefix CHECK-STATIC-ANALYZER-BENCHMARKS %s
 # CHECK-STATIC-ANALYZER-BENCHMARKS: @@@ Static Analyzer Benchmarks @@@

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=279791&r1=279790&r2=279791&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Thu Aug 25 18:29:30 2016
@@ -249,6 +249,7 @@ def cmake_builder(target):
         run_cmd(conf.builddir(), ninja_cmd)
         header("Ninja install")
         run_cmd(conf.builddir(), ninja_cmd + conf.cmake_build_targets)
+        build_upload_artifact()
         footer()
     # Run all the test targets.
     ninja_cmd.extend(['-k', '0', '-v'])
@@ -648,6 +649,7 @@ def build_upload_artifact():
     if conf.noupload:
         print 'Not uploading artificats'
         return
+    header("Uploading Artifact")
     assert conf.svn_rev != "NONE"
     prop_file = "last_good_build.properties"