Skip to content

Commit adc13d7

Browse files
committed
- do not run tests from Slycot dir
1 parent 3d12649 commit adc13d7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,14 @@ install:
3434
fi
3535
- bash miniconda.sh -b -p $HOME/miniconda
3636
- export PATH="$HOME/miniconda/bin:$PATH"
37-
- export PYTHONPATH="${HOME}/build/python-control/Slycot/build/testenv/lib/python${TRAVIS_PYTHON_VERSION}/site-packages:${PYTHONPATH}"
3837
- hash -r
3938
- conda config --set always_yes yes --set changeps1 no
4039
- conda update -q conda
4140
- if [[ $TEST_CONDA == 1 ]]; then conda install conda-build; fi
4241
- conda info -a
4342
#
4443
# Set up a test environment for testing everything out
45-
- conda create -q -n test-environment python="$TRAVIS_PYTHON_VERSION" pip coverage nose numpy
44+
- conda create -q -n test-environment python="$TRAVIS_PYTHON_VERSION" pip coverage nose numpy openblas
4645
- source activate test-environment
4746

4847
#
@@ -77,7 +76,8 @@ install:
7776
script:
7877
# Local unit tests
7978
# TODO: replace with nose?
80-
- python runtests.py --coverage --no-build
79+
- cd ..
80+
- python Slycot/runtests.py --coverage --no-build
8181
#
8282
# As a deeper set of tests, get test against python-control as well
8383
#

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
cmake_minimum_required(VERSION 3.4.0)
44

5-
if (CMAKE_VERSION VERSION_GREATER "3.11.0")
5+
if (CMAKE_VERSION VERSION_GREATER "3.11.99")
66
cmake_policy(SET CMP0074 NEW)
77
endif()
88

0 commit comments

Comments
 (0)