From 7a96a2681f02b58a95f73faccc1c3763d19c8e5b Mon Sep 17 00:00:00 2001 From: Denis Blank Date: Sat, 10 Feb 2018 01:37:38 +0100 Subject: [PATCH] Execute the single tests only once --- test/unit-test/CMakeLists.txt | 82 ++++++++++++------- .../{ => multi}/test-continuable-await.cpp | 0 .../test-continuable-base-chaining.cpp | 0 .../test-continuable-base-destruct.cpp | 0 .../test-continuable-base-errors.cpp | 0 .../test-continuable-base-partial.cpp | 0 .../test-continuable-connection-all.cpp | 0 .../test-continuable-connection-any.cpp | 0 .../test-continuable-connection-seq.cpp | 0 .../{ => multi}/test-continuable-erasure.cpp | 0 .../test-continuable-regression.cpp | 0 .../test-continuable-transforms.cpp | 0 .../test-continuable-expected.cpp | 0 .../test-continuable-traverse-async.cpp | 0 .../test-continuable-traverse.cpp | 0 15 files changed, 53 insertions(+), 29 deletions(-) rename test/unit-test/{ => multi}/test-continuable-await.cpp (100%) rename test/unit-test/{ => multi}/test-continuable-base-chaining.cpp (100%) rename test/unit-test/{ => multi}/test-continuable-base-destruct.cpp (100%) rename test/unit-test/{ => multi}/test-continuable-base-errors.cpp (100%) rename test/unit-test/{ => multi}/test-continuable-base-partial.cpp (100%) rename test/unit-test/{ => multi}/test-continuable-connection-all.cpp (100%) rename test/unit-test/{ => multi}/test-continuable-connection-any.cpp (100%) rename test/unit-test/{ => multi}/test-continuable-connection-seq.cpp (100%) rename test/unit-test/{ => multi}/test-continuable-erasure.cpp (100%) rename test/unit-test/{ => multi}/test-continuable-regression.cpp (100%) rename test/unit-test/{ => multi}/test-continuable-transforms.cpp (100%) rename test/unit-test/{ => single}/test-continuable-expected.cpp (100%) rename test/unit-test/{ => single}/test-continuable-traverse-async.cpp (100%) rename test/unit-test/{ => single}/test-continuable-traverse.cpp (100%) diff --git a/test/unit-test/CMakeLists.txt b/test/unit-test/CMakeLists.txt index 83ca6fa..eeb5f5a 100644 --- a/test/unit-test/CMakeLists.txt +++ b/test/unit-test/CMakeLists.txt @@ -1,37 +1,61 @@ +add_library(test-continuable-base STATIC + ${CMAKE_CURRENT_LIST_DIR}/test-continuable.hpp + ${CMAKE_CURRENT_LIST_DIR}/test-continuable.cpp) + +target_include_directories(test-continuable-base + PUBLIC + ${CMAKE_CURRENT_LIST_DIR}) + +target_link_libraries(test-continuable-base + PUBLIC + gtest-main + cxx_function + continuable + continuable-features-flags + continuable-features-warnings + continuable-features-noexcept) + +add_executable(test-continuable-single + ${CMAKE_CURRENT_LIST_DIR}/single/test-continuable-expected.cpp + ${CMAKE_CURRENT_LIST_DIR}/single/test-continuable-traverse.cpp + ${CMAKE_CURRENT_LIST_DIR}/single/test-continuable-traverse-async.cpp) + +target_link_libraries(test-continuable-single + PUBLIC + test-continuable-base) + +target_include_directories(test-continuable-single + PUBLIC + ${CMAKE_CURRENT_LIST_DIR}/single) + +add_test( + NAME test-continuable-single + COMMAND continuable-unit-tests-single) + foreach(STEP RANGE 4) - set(PROJECT_NAME test-continuable-${STEP}) - set(TEST_NAME continuable-unit-tests-${STEP}) + set(PROJECT_NAME test-continuable-multi-${STEP}) + set(TEST_NAME continuable-unit-tests-multi-${STEP}) add_executable(${PROJECT_NAME} - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable.hpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable.cpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable-await.cpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable-base-chaining.cpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable-base-destruct.cpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable-base-errors.cpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable-base-partial.cpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable-connection-all.cpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable-connection-any.cpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable-connection-seq.cpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable-expected.cpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable-erasure.cpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable-regression.cpp - # ${CMAKE_CURRENT_LIST_DIR}/test-continuable-transforms.cpp - ${CMAKE_CURRENT_LIST_DIR}/test-continuable-traverse.cpp - ${CMAKE_CURRENT_LIST_DIR}/test-continuable-traverse-async.cpp) - - target_include_directories(${PROJECT_NAME} - PRIVATE - ${CMAKE_CURRENT_LIST_DIR}) + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-await.cpp + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-base-chaining.cpp + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-base-destruct.cpp + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-base-errors.cpp + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-base-partial.cpp + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-connection-all.cpp + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-connection-any.cpp + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-connection-seq.cpp + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-erasure.cpp + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-regression.cpp + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-transforms.cpp) target_link_libraries(${PROJECT_NAME} - PRIVATE - gtest-main - cxx_function - continuable - continuable-features-flags - continuable-features-warnings - continuable-features-noexcept) + PUBLIC + test-continuable-base) + + target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_LIST_DIR}) target_compile_definitions(${PROJECT_NAME} PUBLIC diff --git a/test/unit-test/test-continuable-await.cpp b/test/unit-test/multi/test-continuable-await.cpp similarity index 100% rename from test/unit-test/test-continuable-await.cpp rename to test/unit-test/multi/test-continuable-await.cpp diff --git a/test/unit-test/test-continuable-base-chaining.cpp b/test/unit-test/multi/test-continuable-base-chaining.cpp similarity index 100% rename from test/unit-test/test-continuable-base-chaining.cpp rename to test/unit-test/multi/test-continuable-base-chaining.cpp diff --git a/test/unit-test/test-continuable-base-destruct.cpp b/test/unit-test/multi/test-continuable-base-destruct.cpp similarity index 100% rename from test/unit-test/test-continuable-base-destruct.cpp rename to test/unit-test/multi/test-continuable-base-destruct.cpp diff --git a/test/unit-test/test-continuable-base-errors.cpp b/test/unit-test/multi/test-continuable-base-errors.cpp similarity index 100% rename from test/unit-test/test-continuable-base-errors.cpp rename to test/unit-test/multi/test-continuable-base-errors.cpp diff --git a/test/unit-test/test-continuable-base-partial.cpp b/test/unit-test/multi/test-continuable-base-partial.cpp similarity index 100% rename from test/unit-test/test-continuable-base-partial.cpp rename to test/unit-test/multi/test-continuable-base-partial.cpp diff --git a/test/unit-test/test-continuable-connection-all.cpp b/test/unit-test/multi/test-continuable-connection-all.cpp similarity index 100% rename from test/unit-test/test-continuable-connection-all.cpp rename to test/unit-test/multi/test-continuable-connection-all.cpp diff --git a/test/unit-test/test-continuable-connection-any.cpp b/test/unit-test/multi/test-continuable-connection-any.cpp similarity index 100% rename from test/unit-test/test-continuable-connection-any.cpp rename to test/unit-test/multi/test-continuable-connection-any.cpp diff --git a/test/unit-test/test-continuable-connection-seq.cpp b/test/unit-test/multi/test-continuable-connection-seq.cpp similarity index 100% rename from test/unit-test/test-continuable-connection-seq.cpp rename to test/unit-test/multi/test-continuable-connection-seq.cpp diff --git a/test/unit-test/test-continuable-erasure.cpp b/test/unit-test/multi/test-continuable-erasure.cpp similarity index 100% rename from test/unit-test/test-continuable-erasure.cpp rename to test/unit-test/multi/test-continuable-erasure.cpp diff --git a/test/unit-test/test-continuable-regression.cpp b/test/unit-test/multi/test-continuable-regression.cpp similarity index 100% rename from test/unit-test/test-continuable-regression.cpp rename to test/unit-test/multi/test-continuable-regression.cpp diff --git a/test/unit-test/test-continuable-transforms.cpp b/test/unit-test/multi/test-continuable-transforms.cpp similarity index 100% rename from test/unit-test/test-continuable-transforms.cpp rename to test/unit-test/multi/test-continuable-transforms.cpp diff --git a/test/unit-test/test-continuable-expected.cpp b/test/unit-test/single/test-continuable-expected.cpp similarity index 100% rename from test/unit-test/test-continuable-expected.cpp rename to test/unit-test/single/test-continuable-expected.cpp diff --git a/test/unit-test/test-continuable-traverse-async.cpp b/test/unit-test/single/test-continuable-traverse-async.cpp similarity index 100% rename from test/unit-test/test-continuable-traverse-async.cpp rename to test/unit-test/single/test-continuable-traverse-async.cpp diff --git a/test/unit-test/test-continuable-traverse.cpp b/test/unit-test/single/test-continuable-traverse.cpp similarity index 100% rename from test/unit-test/test-continuable-traverse.cpp rename to test/unit-test/single/test-continuable-traverse.cpp