From 05727b0ee6459ae4c7f832e5fc5a95945048d3c1 Mon Sep 17 00:00:00 2001 From: Denis Blank Date: Mon, 12 Mar 2018 09:56:53 +0100 Subject: [PATCH] Reduce the amount of instantiations tested inside the CI --- .travis.yml | 3 +++ CMakeLists.txt | 4 ++++ test/unit-test/CMakeLists.txt | 8 +++++++- tools/travis-ci.sh | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 161af2f..7e5b389 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ matrix: - COMPILER=g++-6 - WITH_NO_EXCEPTIONS=OFF - WITH_AWAIT=OFF + - WITH_LIGHT_TESTS=ON - os: linux compiler: clang @@ -41,6 +42,7 @@ matrix: - COMPILER=clang++-5.0 - WITH_NO_EXCEPTIONS=OFF - WITH_AWAIT=OFF + - WITH_LIGHT_TESTS=OFF - os: linux compiler: clang @@ -58,6 +60,7 @@ matrix: - COMPILER=clang++-5.0 - WITH_NO_EXCEPTIONS=ON - WITH_AWAIT=ON + - WITH_LIGHT_TESTS=ON install: - export CXX=$COMPILER diff --git a/CMakeLists.txt b/CMakeLists.txt index e6e75ea..2d6263c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,10 @@ option(CTI_CONTINUABLE_WITH_CPP_LATEST "Enable the highest C++ standard available for testing polyfills" OFF) +option(CTI_CONTINUABLE_WITH_LIGHT_TESTS + "Disable some template heavy unit tests (for CI usage)" + OFF) + include(cmake/CMakeLists.txt) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/test/unit-test/CMakeLists.txt b/test/unit-test/CMakeLists.txt index 192ca83..d37562d 100644 --- a/test/unit-test/CMakeLists.txt +++ b/test/unit-test/CMakeLists.txt @@ -34,7 +34,13 @@ add_test( NAME continuable-unit-tests-single COMMAND test-continuable-single) -foreach(STEP RANGE 4) +if (CTI_CONTINUABLE_WITH_LIGHT_TESTS) + set(STEP_RANGE 0) +else() + set(STEP_RANGE 4) +endif() + +foreach(STEP RANGE ${STEP_RANGE}) set(PROJECT_NAME test-continuable-multi-${STEP}) set(TEST_NAME continuable-unit-tests-multi-${STEP}) diff --git a/tools/travis-ci.sh b/tools/travis-ci.sh index d1be75b..b2d6049 100644 --- a/tools/travis-ci.sh +++ b/tools/travis-ci.sh @@ -43,7 +43,7 @@ function renew_build { cd build # Configure the project and build it - cmake -GNinja -DCMAKE_CXX_FLAGS="$STD_CXX_FLAGS $CMAKE_CXX_FLAGS -Werror" -DCMAKE_EXE_LINKER_FLAGS="$STD_LINKER_FLAGS" -DCTI_CONTINUABLE_WITH_NO_EXCEPTIONS=$WITH_NO_EXCEPTIONS -DCTI_CONTINUABLE_WITH_EXPERIMENTAL_COROUTINE=$WITH_AWAIT -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug .. + cmake -GNinja -DCMAKE_CXX_FLAGS="$STD_CXX_FLAGS $CMAKE_CXX_FLAGS -Werror" -DCMAKE_EXE_LINKER_FLAGS="$STD_LINKER_FLAGS" -DCTI_CONTINUABLE_WITH_NO_EXCEPTIONS=$WITH_NO_EXCEPTIONS -DCTI_CONTINUABLE_WITH_EXPERIMENTAL_COROUTINE=$WITH_AWAIT -DCTI_CONTINUABLE_WITH_LIGHT_TESTS=$WITH_LIGHT_TESTS -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug .. } if [[ $CXX == *"clang"* ]]; then