Commit 82b8f8b4 authored by Davis King's avatar Davis King

more travis testing

parent f8f7962b
...@@ -4,18 +4,27 @@ matrix: ...@@ -4,18 +4,27 @@ matrix:
include: include:
################### ###################
- language: cpp - language: cpp
compiler: compiler: clang
- gcc
os: linux os: linux
env: env:
- VARIANT=test - VARIANT=test
- CXX=clang++
- CC=clang
script: script:
- dlib/travis/build-and-test.sh - dlib/travis/build-and-test.sh
################### ###################
- language: cpp - language: cpp
compiler: compiler: gcc
- gcc os: linux
env:
- VARIANT=test
script:
- dlib/travis/build-and-test.sh
###################
- language: cpp
compiler: gcc
os: linux os: linux
env: env:
- VARIANT=examples - VARIANT=examples
...@@ -30,6 +39,14 @@ matrix: ...@@ -30,6 +39,14 @@ matrix:
script: script:
- dlib/travis/build-and-test.sh - dlib/travis/build-and-test.sh
###################
- language: python
python: 3.5
env:
- VARIANT=python-api
script:
- dlib/travis/build-and-test.sh
################### ###################
- language: cpp - language: cpp
os: osx os: osx
......
...@@ -20,12 +20,12 @@ fi ...@@ -20,12 +20,12 @@ fi
if [ "$VARIANT" = "python-api" ]; then if [ "$VARIANT" = "python-api" ]; then
python setup.py test --clean python setup.py test --clean
pip install --user numpy pip install numpy
python setup.py test --clean python setup.py test --clean
fi fi
if [ "$VARIANT" = "python3-api" ]; then if [ "$VARIANT" = "python3-api" ]; then
python3 setup.py test --clean python3 setup.py test --clean
pip3 install --user numpy pip3 install numpy
python3 setup.py test --clean python3 setup.py test --clean
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment