Merge pull request #108 from jdumas/master

[nlopt.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index d1f8a36cc048b88792d508ccfa75a9284575f680..a7efc2a8088611abb88929023653c6505b5f9026 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ matrix:
     - os: linux
       addons:
         apt:
+          sources:
+          - george-edison55-precise-backports
           packages:
           - swig
           - python-dev
@@ -13,6 +15,7 @@ matrix:
           - guile-2.0-dev
           - octave3.2-headers
           - cmake
+          - cmake-data
           - g++-mingw-w64-i686
           - gcc-mingw-w64-i686
           - binutils-mingw-w64-i686
@@ -22,21 +25,21 @@ matrix:
       script:
         - mkdir build && pushd build
         - cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_CXX=ON ..
-        - make install -j2 && make tests -j2 && ctest -j2 --output-on-failure
+        - make install -j2 && ctest -j2 --output-on-failure
         - rm -rf * ~/.local
         - cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_CXX=ON -DBUILD_PYTHON=OFF -DBUILD_OCTAVE=OFF -DBUILD_GUILE=OFF -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/toolchain-i686-w64-mingw32.cmake ..
-        - make install -j2 && make tests -j2
+        - make install -j2
         - rm -rf * ~/.local
         - cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_CXX=ON -DBUILD_PYTHON=OFF -DBUILD_OCTAVE=OFF -DBUILD_GUILE=OFF -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/toolchain-x86_64-w64-mingw32.cmake ..
-        - make install -j2 && make tests -j2
+        - make install -j2
 
     - os: osx
       install:
-        - brew tap homebrew/python
         - brew tap homebrew/science
         - brew update
-        - brew install swig numpy octave guile
+        # TODO: install guile once 2.2 is supported in swig
+        - brew install swig octave || echo "nope"
       script:
         - mkdir build && pushd build
-        - cmake -DCMAKE_INSTALL_PREFIX=~/.local  -DWITH_CXX=ON ..
-        - make install && make tests && ctest --output-on-failure
+        - cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_CXX=ON -DPYTHON_EXECUTABLE=/usr/bin/python ..
+        - make install && ctest --output-on-failure