diff options
| author | Chris Matthews <cmatthews5@apple.com> | 2016-08-25 23:29:30 +0000 |
|---|---|---|
| committer | Chris Matthews <cmatthews5@apple.com> | 2016-08-25 23:29:30 +0000 |
| commit | 207a3023a107da2058cd0f77f7f21568c1a6e544 (patch) | |
| tree | dce9ff2f5e605ab151bdbd254515865650644dd2 | |
| parent | bdf95f618eaae7cc1f73cd14de33bb291428666b (diff) | |
Make CMake builds upload artifacts too
The cmake builds did not upload their artifacts, that was a error.
git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@279791 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/jenkins/test_build.py | 4 | ||||
| -rw-r--r-- | zorg/jenkins/build.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/jenkins/test_build.py b/test/jenkins/test_build.py index cdd7707b..0404842a 100644 --- a/test/jenkins/test_build.py +++ b/test/jenkins/test_build.py @@ -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 @@@ diff --git a/zorg/jenkins/build.py b/zorg/jenkins/build.py index 08eeeabe..b337aa48 100644 --- a/zorg/jenkins/build.py +++ b/zorg/jenkins/build.py @@ -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" |