make builds with python tests and cpp tests fail if either one fails (#1967)

This commit is contained in:
Hans Dembinski 2019-10-22 16:19:15 +01:00 committed by Wenzel Jakob
parent 759221f5c5
commit c27a6e1378

View File

@ -32,8 +32,7 @@ matrix:
- | - |
# Barebones build # Barebones build
cmake -DCMAKE_BUILD_TYPE=Debug -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DPYTHON_EXECUTABLE=$(which $PY_CMD) . cmake -DCMAKE_BUILD_TYPE=Debug -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DPYTHON_EXECUTABLE=$(which $PY_CMD) .
make pytest -j 2 make pytest -j 2 && make cpptest -j 2
make cpptest -j 2
# The following are regular test configurations, including optional dependencies. # The following are regular test configurations, including optional dependencies.
# With regard to each other they differ in Python version, C++ standard and compiler. # With regard to each other they differ in Python version, C++ standard and compiler.
- os: linux - os: linux
@ -131,8 +130,7 @@ matrix:
- | - |
# Barebones build # Barebones build
cmake -DCMAKE_BUILD_TYPE=Debug -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DPYTHON_EXECUTABLE=$(which $PY_CMD) . cmake -DCMAKE_BUILD_TYPE=Debug -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DPYTHON_EXECUTABLE=$(which $PY_CMD) .
make pytest -j 2 make pytest -j 2 && make cpptest -j 2
make cpptest -j 2
- os: osx - os: osx
name: Python 2.7, c++14, AppleClang 7.3, CMake test name: Python 2.7, c++14, AppleClang 7.3, CMake test
osx_image: xcode7.3 osx_image: xcode7.3