[zorg] r317704 - jenkins/build.py: Set SVN_REVISION for `build.py cmake` builds

[Matthias Braun via llvm-commits]

Author: matze
Date: Wed Nov  8 10:58:04 2017
New Revision: 317704

URL: http://llvm.org/viewvc/llvm-project?rev=317704&view=rev
Log:
jenkins/build.py: Set SVN_REVISION for `build.py cmake` builds

build.py cmake: copies together multiple repositories; the llvm cmake
scripts are not able to automatically figure out the revision number
because the resulting directory tree is not a repository anymore.

Explicitly set the SVN_REVISION cmake property instead.

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=317704&r1=317703&r2=317704&view=diff
==============================================================================
--- zorg/trunk/test/jenkins/test_build.py (original)
+++ zorg/trunk/test/jenkins/test_build.py Wed Nov  8 10:58:04 2017
@@ -132,6 +132,7 @@
 # CHECK-CMAKELTO-NOT:: '-DLLVM_ENABLE_LTO=Off
 # CHECK-CMAKELTO: '-DLLVM_PARALLEL_LINK_JOBS=1'
 # CHECK-CMAKELTO: '-DCMAKE_BUILD_TYPE=Release'
+# CHECK-CMAKELTO: '-DSVN_REVISION=1234'
 
 # RUN: env MAX_PARALLEL_LINKS=2 python %{src_root}/zorg/jenkins/build.py cmake all --lto | FileCheck --check-prefix CHECK-CMAKE-PAR-LTO %s
 # CHECK-CMAKE-PAR-LTO: '/usr/local/bin/cmake' '-G' 'Ninja'
@@ -170,4 +171,4 @@
 
 # Test long should always do check-all, since that is what many bots expect.
 # RUN: python %{src_root}/zorg/jenkins/build.py cmake testlong  | FileCheck --check-prefix CHECK-TTARGETS2 %s
-# CHECK-TTARGETS2: '/usr/local/bin/ninja' '-v' '-k' '0' 'check-all'
\ No newline at end of file
+# CHECK-TTARGETS2: '/usr/local/bin/ninja' '-v' '-k' '0' 'check-all'

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=317704&r1=317703&r2=317704&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Wed Nov  8 10:58:04 2017
@@ -260,6 +260,9 @@ def cmake_builder(target):
     if conf.globalisel:
         cmake_cmd += ["-DLLVM_BUILD_GLOBAL_ISEL=ON"]
 
+    if conf.svn_rev != 'NONE':
+        cmake_cmd += ["-DSVN_REVISION={}".format(conf.svn_rev)]
+
     lit_flags = ['--xunit-xml-output=testresults.xunit.xml', '-v']
     if conf.max_parallel_tests:
         lit_flags += ['-j', conf.max_parallel_tests]