diff options
| author | Chris Matthews <cmatthews5@apple.com> | 2016-08-24 00:01:44 +0000 |
|---|---|---|
| committer | Chris Matthews <cmatthews5@apple.com> | 2016-08-24 00:01:44 +0000 |
| commit | 96b145319f4781a007eedae3f61f6fd2672b6190 (patch) | |
| tree | 123b9a7f076a90b63f0baf91e86051ca9853e15b | |
| parent | 8b8ee831997053e92c9cbc431ff4d53e4dd93ce1 (diff) | |
Run tests with keep going, so we run all the tests
If a test fails laster test targets won't be run. That is annoying.
Keep going when test targets fail.
git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@279593 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/jenkins/test_build.py | 6 | ||||
| -rw-r--r-- | zorg/jenkins/build.py | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/test/jenkins/test_build.py b/test/jenkins/test_build.py index 71039d9c..d7a60dca 100644 --- a/test/jenkins/test_build.py +++ b/test/jenkins/test_build.py @@ -53,7 +53,7 @@ # CHECK-SIMPLE: @@@ Tests @@@ # CHECK-SIMPLE: cd -# CHECK-SIMPLE: 'env' 'MALLOC_LOG_FILE=/dev/null' '/usr/local/bin/ninja' '-v' 'check-all' +# CHECK-SIMPLE: 'env' 'MALLOC_LOG_FILE=/dev/null' '/usr/local/bin/ninja' '-v' '-k' '0' 'check-all' # Now Check Assertion Buiilds have --enable assertions @@ -86,8 +86,8 @@ # 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' 'check' 'check-clang' -# CHECK-CMAKE: '/usr/local/bin/ninja' 'check-all' +# CHECK-CMAKE: '/usr/local/bin/ninja' '-k' '0' '-v' 'check' 'check-clang' +# CHECK-CMAKE: '/usr/local/bin/ninja' '-k' '0' '-v' 'check-all' # RUN: python %{src_root}/zorg/jenkins/build.py cmake build diff --git a/zorg/jenkins/build.py b/zorg/jenkins/build.py index 2bded124..6fc3fe39 100644 --- a/zorg/jenkins/build.py +++ b/zorg/jenkins/build.py @@ -250,7 +250,8 @@ def cmake_builder(target): header("Ninja install") run_cmd(conf.builddir(), ninja_cmd + ['install']) footer() - + # Run all the test targets. + ninja_cmd.extend(['-k', '0', '-v']) if target == 'all' or target == 'test': header("Ninja test") run_cmd(conf.builddir(), ninja_cmd + ['check', 'check-clang']) @@ -380,7 +381,7 @@ def clang_builder(target): obj_dir = os.path.join(conf._build_dir, 'Build/') obj_dir = os.path.join(conf.workspace, obj_dir) - cmd = [NINJA, '-v', 'check-all'] + cmd = [NINJA, '-v', '-k', '0', 'check-all'] if conf.assertions: cmd[-1] += ' --param use_gmalloc=1 ' \ |