Skip to content

Commit

Permalink
Travis: attempt to fix ruby_modular interface
Browse files Browse the repository at this point in the history
remove on failure ctest setting
  • Loading branch information
vigsterkr committed Aug 5, 2013
1 parent d69a5fc commit 652e041
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ notifications:
env:
- CMAKE_OPTIONS="-DGOOGLE_MOCK_SOURCE_DIR=`pwd`/shogun-toolbox/shogun/gmock-1.6.0" EXTRA_PACKAGES="valgrind"
- CMAKE_OPTIONS="-DPythonModular=ON" EXTRA_PACKAGES="python-numpy-dev python-dev python-scipy swig2.0"
- CMAKE_OPTIONS="-DPythonModular=ON" EXTRA_PACKAGES="python3-numpy python3-dev python3-scipy swig2.0" IS_PYTHON3=1
- CMAKE_OPTIONS="-DPythonModular=ON" EXTRA_PACKAGES="python3-numpy python3-dev python3-scipy swig2.0"
- CMAKE_OPTIONS="-DRModular=ON" EXTRA_PACKAGES="r-base-core swig2.0"
- CMAKE_OPTIONS="-DJavaModular=ON" EXTRA_PACKAGES="openjdk-6-jdk jblas ant swig2.0"
- CMAKE_OPTIONS="-DRubyModular=ON" EXTRA_PACKAGES="ruby ruby-dev ruby-narray swig2.0"
- CMAKE_OPTIONS="-DRubyModular=ON" EXTRA_PACKAGES="swig2.0" IS_RUBY=1
- CMAKE_OPTIONS="-DCSharpModular=ON" EXTRA_PACKAGES="mono-devel mono-gmcs cli-common-dev swig2.0"
- CMAKE_OPTIONS="-DLuaModular=ON" EXTRA_PACKAGES="lua5.1 liblua5.1-0-dev swig2.0"
- CMAKE_OPTIONS="-DOctaveModular=ON" EXTRA_PACKAGES="octave octave3.2-headers swig2.0"
Expand All @@ -28,13 +28,13 @@ matrix:
- compiler: gcc
env: CMAKE_OPTIONS="-DPythonModular=ON" EXTRA_PACKAGES="python-numpy-dev python-dev python-scipy swig2.0"
- compiler: gcc
env: CMAKE_OPTIONS="-DPythonModular=ON" EXTRA_PACKAGES="python3-numpy python3-dev python3-scipy swig2.0" IS_PYTHON3=1
env: CMAKE_OPTIONS="-DPythonModular=ON" EXTRA_PACKAGES="python3-numpy python3-dev python3-scipy swig2.0"
- compiler: gcc
env: CMAKE_OPTIONS="-DRModular=ON" EXTRA_PACKAGES="r-base-core swig2.0"
- compiler: gcc
env: CMAKE_OPTIONS="-DJavaModular=ON" EXTRA_PACKAGES="openjdk-6-jdk jblas ant swig2.0"
- compiler: gcc
env: CMAKE_OPTIONS="-DRubyModular=ON" EXTRA_PACKAGES="ruby ruby-dev ruby-narray swig2.0"
env: CMAKE_OPTIONS="-DRubyModular=ON" EXTRA_PACKAGES="swig2.0" IS_RUBY=1
- compiler: gcc
env: CMAKE_OPTIONS="-DCSharpModular=ON" EXTRA_PACKAGES="mono-devel mono-gmcs cli-common-dev swig2.0"
- compiler: gcc
Expand All @@ -47,5 +47,5 @@ before_install:
before_script:
- mkdir build
- cd build
- if [ ! -z ${IS_PYTHON3} ] ; then sudo update-alternatives --set python /usr/bin/python3 ; fi
- if [ ! -z ${IS_RUBY} ] ; then sudo gem install narray ; fi
script: cmake -DENABLE_TESTING=ON $CMAKE_OPTIONS .. && make -j 4 && sudo make install && ctest --output-on-failure
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,6 @@ IF(ENABLE_TESTING)
enable_testing()
ENDIF()

set(CTEST_OUTPUT_ON_FAILURE TRUE)

# add integration tests
add_subdirectory(tests/integration)

Expand Down

0 comments on commit 652e041

Please sign in to comment.