[zorg] r279721 - Add custom ninja build and test targets and fix a xml bug

Chris Matthews via llvm-commits llvm-commits at lists.llvm.org
Wed Aug 24 22:30:42 PDT 2016


Author: cmatthews
Date: Thu Aug 25 00:30:42 2016
New Revision: 279721

URL: http://llvm.org/viewvc/llvm-project?rev=279721&view=rev
Log:
Add custom ninja build and test targets and fix a xml bug

Sometimes it is nice to call your own ninja targets.  You can do that
now.  Also, the all target was overwriting the XML output. This should
fix that.

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=279721&r1=279720&r2=279721&view=diff
==============================================================================
--- zorg/trunk/test/jenkins/test_build.py (original)
+++ zorg/trunk/test/jenkins/test_build.py Thu Aug 25 00:30:42 2016
@@ -86,8 +86,7 @@
 # CHECK-CMAKE: '-DLLVM_ENABLE_ASSERTIONS=Off'
 # CHECK-CMAKE: -DLLVM_LIT_ARGS=--xunit-xml-output=testresults.xunit.xml -v
 # CHECK-CMAKE: '/usr/local/bin/ninja'
-# CHECK-CMAKE: '/usr/local/bin/ninja' '-k' '0' '-v' 'check' 'check-clang'
-# CHECK-CMAKE: '/usr/local/bin/ninja' '-k' '0' '-v' 'check-all'
+# CHECK-CMAKE: '/usr/local/bin/ninja' '-k' '0' '-v' 'check' 'check-clang' 'check-all'
 
 
 # RUN: python %{src_root}/zorg/jenkins/build.py cmake build
@@ -160,3 +159,9 @@
 
 # RUN: python %{src_root}/zorg/jenkins/build.py clang all --lto --cmake-flag="-DFOO" | FileCheck --check-prefix CHECK-CMAKEFLAGS %s
 # CHECK-CMAKEFLAGS: '-DFOO'
+
+# RUN: python %{src_root}/zorg/jenkins/build.py cmake all --cmake-build-target foo --cmake-build-target bar | FileCheck --check-prefix CHECK-BTARGETS %s
+# CHECK-BTARGETS: 'foo' 'bar'
+
+# RUN: python %{src_root}/zorg/jenkins/build.py cmake all --cmake-test-target foo --cmake-test-target bar | FileCheck --check-prefix CHECK-TTARGETS %s
+# CHECK-TTARGETS: 'foo' 'bar'

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=279721&r1=279720&r2=279721&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Thu Aug 25 00:30:42 2016
@@ -248,18 +248,14 @@ def cmake_builder(target):
         header("Ninja build")
         run_cmd(conf.builddir(), ninja_cmd)
         header("Ninja install")
-        run_cmd(conf.builddir(), ninja_cmd + ['install'])
+        run_cmd(conf.builddir(), ninja_cmd + conf.cmake_build_targets)
         footer()
     # Run all the test targets.
     ninja_cmd.extend(['-k', '0', '-v'])
-    if target == 'all' or target == 'test':
+    if target == 'all' or target == 'test' or target == 'testlong':
         header("Ninja test")
-        run_cmd(conf.builddir(), ninja_cmd + ['check', 'check-clang'])
-        footer()
-
-    if target == 'all' or target == 'testlong':
-        header("Ninja test")
-        run_cmd(conf.builddir(), ninja_cmd + ['check-all'])
+        long = ['check-all'] if target == 'testlong' or target == 'all' else []
+        run_cmd(conf.builddir(), ninja_cmd + conf.cmake_test_targets + long)
         footer()
 
 
@@ -803,7 +799,6 @@ def run_ws(cmd, env=None):
     return run_cmd(conf.workspace, cmd, env)
 
 
-
 def parse_args():
     """Get the command line arguments, and make sure they are correct."""
 
@@ -828,6 +823,12 @@ def parse_args():
     parser.add_argument('--cmake-flag', dest='cmake_flags',
                         action='append', default=[],
                         help='Set an arbitrary cmake flag')
+    parser.add_argument('--cmake-test-target', dest='cmake_test_targets',
+                        action='append', default=['check', 'check-clang'],
+                        help='Targets to build during testing')
+    parser.add_argument('--cmake-build-target', dest='cmake_build_targets',
+                        action='append', default=['install'],
+                        help='Targets to build during building.')
     parser.add_argument('--compiler-flag', dest='compiler_flags',
                         action='append', default=[],
                         help='Set an arbitrary compiler flag')




More information about the llvm-commits mailing list