diff --git a/.travis.yml b/.travis.yml index 5e1866ef330..ac344ad548c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ notifications: - "it's %{author}'s turn to pay the next round of drinks for the massacre he caused in %{repository}: %{build_url}" env: global: - - INTERFACE_TEST_OPTIONS="-DTRAVIS_DISABLE_UNIT_TESTS=ON -DTRAVIS_DISABLE_LIBSHOGUN_TESTS=ON -DTRAVIS_DISABLE_META_CPP=ON" + - INTERFACE_TEST_OPTIONS="-DTRAVIS_DISABLE_UNIT_TESTS=ON -DTRAVIS_DISABLE_META_CPP=ON" matrix: fast_finish: true include: diff --git a/CMakeLists.txt b/CMakeLists.txt index cfe7fc951b8..2ce57a69fc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -534,7 +534,6 @@ ENDIF() OPTION(ENABLE_TESTING "Enable testing" OFF) OPTION(TRAVIS_DISABLE_UNIT_TESTS "Disable unit testing to speed up jobs on travis-ci" OFF) -OPTION(TRAVIS_DISABLE_LIBSHOGUN_TESTS "Disable libshogun tests to speed up jobs on travis-ci" OFF) OPTION(TRAVIS_DISABLE_META_CPP "Disable cpp meta examples and integration testing to speed up jobs on travis-ci" OFF) OPTION(DISABLE_META_INTEGRATION_TESTS "Disable meta integration testing to speed up build" OFF) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 0b3d5780f52..eefdab9cbe3 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -IF (NOT TRAVIS_DISABLE_LIBSHOGUN_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/libshogun) +IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/libshogun) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/undocumented/libshogun) ENDIF()