diff options
| author | Brett Cannon <brettcannon@users.noreply.github.com> | 2017-03-17 15:46:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 15:46:32 -0700 |
| commit | a5f8165909adebbe0d6d7ab386227b768f84292a (patch) | |
| tree | 7d13b50062152b71f39f2966e9cf37460fc9d322 /.travis.yml | |
| parent | 1aa1803b3df2af9481628b8896babbd686d314ff (diff) | |
| download | cpython-git-a5f8165909adebbe0d6d7ab386227b768f84292a.tar.gz | |
[2.7] Combine the C++ header CI build into the main C build (GH-697) (#706)
This will eliminate one of the builds in Travis, allowing for CI overall to complete faster.
(cherry picked from commit 993d4b3440f2282976901ce66879037c4443868a)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index b426d219a4..1e1f1a8eea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,15 +38,6 @@ matrix: script: - make html SPHINXOPTS="-q" - make check - - os: linux - language: cpp - compiler: clang - env: - - TESTING="C++ header compatibility" - before_script: - - ./configure - script: - - echo '#include "Python.h"' > test.cc && $CXX -c test.cc -o /dev/null -I ./Include -I . # Travis provides only 2 cores, so don't overdue the parallelism and waste memory. before_script: @@ -62,6 +53,8 @@ before_script: script: # `-r -w` implicitly provided through `make buildbottest`. - make buildbottest TESTOPTS="-j4" + # Test for C++ header compatibility. + - echo '#include "Python.h"' > test.cc && $CXX -c test.cc -o /dev/null -I ./Include -I . notifications: email: false |