Travis: Newer CMake, No RT CUDA Device Test

This commit is contained in:
Axel Huebl 2016-01-19 00:10:23 +01:00
parent ee053e9236
commit 6c98c38dfa
2 changed files with 12 additions and 1 deletions

View File

@ -7,9 +7,12 @@ cache:
addons: addons:
apt: apt:
sources: sources:
- george-edison55-precise-backports
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- deadsnakes - deadsnakes
packages: packages:
- cmake-data
- cmake
- g++-4.9 - g++-4.9
- g++-4.8 - g++-4.8
- g++-4.8-multilib - g++-4.8-multilib
@ -55,7 +58,8 @@ matrix:
fi fi
script: script:
- pyvenv-3.5 venv - pyvenv-3.5 venv
- export CXX=`g++-4.9` - export CXX=$(which g++-4.9)
- export CC=$(which gcc-4.9)
- cmake -DPYBIND11_PYTHON_VERSION=3.5 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.5m -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.5m.so -DPYTHON_EXECUTABLE:FILEPATH=`pwd`/venv/bin/python3.5 - cmake -DPYBIND11_PYTHON_VERSION=3.5 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.5m -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.5m.so -DPYTHON_EXECUTABLE:FILEPATH=`pwd`/venv/bin/python3.5
- make -j 2 - make -j 2
- source venv/bin/activate - source venv/bin/activate
@ -63,6 +67,9 @@ matrix:
- CTEST_OUTPUT_ON_FAILURE=TRUE make test - CTEST_OUTPUT_ON_FAILURE=TRUE make test
- os: osx - os: osx
compiler: clang compiler: clang
before_install:
- brew update
- brew outdated cmake || brew upgrade cmake
script: script:
- cmake -DPYBIND11_PYTHON_VERSION=2.7 - cmake -DPYBIND11_PYTHON_VERSION=2.7
- make -j 2 - make -j 2

View File

@ -55,6 +55,10 @@ reference = sanitize(open(name + '.ref', 'r').read())
if 'NumPy missing' in output: if 'NumPy missing' in output:
print('Test "%s" could not be run.' % name) print('Test "%s" could not be run.' % name)
exit(0) exit(0)
elif 'no CUDA-capable device is detected' in output or \
'CUDA driver version is insufficient' in output:
print('Test "%s" could not be run (missing CUDA device).' % name)
exit(0)
elif output == reference: elif output == reference:
print('Test "%s" succeeded.' % name) print('Test "%s" succeeded.' % name)
exit(0) exit(0)