From 2b40b8cbd3e4862dc0f02adb75ae2741c7e07296 Mon Sep 17 00:00:00 2001 From: Henry Fredrick Schreiner Date: Tue, 14 Feb 2017 12:26:07 -0500 Subject: [PATCH] Removing automatic testing with single file, kept on travis --- .ci/travis.sh | 2 +- CMakeLists.txt | 2 ++ tests/CMakeLists.txt | 4 +--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/travis.sh b/.ci/travis.sh index cd8ba2b8..933c086c 100755 --- a/.ci/travis.sh +++ b/.ci/travis.sh @@ -4,6 +4,6 @@ env | sort mkdir build || true cd build -cmake .. +cmake .. -DCLI_SINGLE_FILE_TESTS=ON make CTEST_OUTPUT_ON_FAILURE=1 make test diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a38ba4e..19815cee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,8 @@ if(CLI_SINGLE_FILE) target_include_directories(CLI_SINGLE INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/include/") endif() +option(CLI_SINGLE_FILE_TESTS "Duplicate all the tests for a single file build" OFF) + option(CLI_TESTING "Build the tests and add them" ${CUR_PROJ}) if(CLI_TESTING) enable_testing() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6bf9422b..64a8e606 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -17,12 +17,10 @@ foreach(T ${CLI_TESTS}) target_link_libraries(${T} PUBLIC CLI) add_gtest(${T}) - if(CLI_SINGLE_FILE) - + if(CLI_SINGLE_FILE AND CLI_SINGLE_FILE_TESTS) add_executable(${T}_Single ${T}.cpp) target_link_libraries(${T}_Single PUBLIC CLI_SINGLE) add_gtest(${T}_Single) - endif() endforeach()