From 219ecd179f3011af055d3b152cc818387b642923 Mon Sep 17 00:00:00 2001 From: Andreas Buhr Date: Tue, 13 Oct 2020 01:31:20 +0200 Subject: [PATCH] add doctest include wrapper to avoid linker problems --- test/async_auto_reset_event_tests.cpp | 2 +- test/async_generator_tests.cpp | 2 +- test/async_latch_tests.cpp | 2 +- test/async_manual_reset_event_tests.cpp | 2 +- test/async_mutex_tests.cpp | 2 +- test/cancellation_token_tests.cpp | 2 +- test/doctest/cppcoro_doctest.h | 11 +++++++++++ test/file_tests.cpp | 2 +- test/generator_tests.cpp | 2 +- test/io_service_tests.cpp | 2 +- test/ip_address_tests.cpp | 2 +- test/ip_endpoint_tests.cpp | 2 +- test/ipv4_address_tests.cpp | 2 +- test/ipv4_endpoint_tests.cpp | 2 +- test/ipv6_address_tests.cpp | 2 +- test/ipv6_endpoint_tests.cpp | 2 +- test/main.cpp | 2 +- test/multi_producer_sequencer_tests.cpp | 2 +- test/recursive_generator_tests.cpp | 2 +- test/scheduling_operator_tests.cpp | 2 +- test/sequence_barrier_tests.cpp | 2 +- test/shared_task_tests.cpp | 2 +- test/single_consumer_async_auto_reset_event_tests.cpp | 2 +- test/single_producer_sequencer_tests.cpp | 2 +- test/socket_tests.cpp | 2 +- test/static_thread_pool_tests.cpp | 2 +- test/sync_wait_tests.cpp | 2 +- test/task_tests.cpp | 2 +- test/when_all_ready_tests.cpp | 2 +- test/when_all_tests.cpp | 2 +- 30 files changed, 40 insertions(+), 29 deletions(-) create mode 100644 test/doctest/cppcoro_doctest.h diff --git a/test/async_auto_reset_event_tests.cpp b/test/async_auto_reset_event_tests.cpp index e2e8d723..32cdb42b 100644 --- a/test/async_auto_reset_event_tests.cpp +++ b/test/async_auto_reset_event_tests.cpp @@ -18,7 +18,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("async_auto_reset_event"); diff --git a/test/async_generator_tests.cpp b/test/async_generator_tests.cpp index 6390555e..7a575f1c 100644 --- a/test/async_generator_tests.cpp +++ b/test/async_generator_tests.cpp @@ -10,7 +10,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("async_generator"); diff --git a/test/async_latch_tests.cpp b/test/async_latch_tests.cpp index a90a7ba1..9a892070 100644 --- a/test/async_latch_tests.cpp +++ b/test/async_latch_tests.cpp @@ -10,7 +10,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("async_latch"); diff --git a/test/async_manual_reset_event_tests.cpp b/test/async_manual_reset_event_tests.cpp index 8e0b4759..1673204c 100644 --- a/test/async_manual_reset_event_tests.cpp +++ b/test/async_manual_reset_event_tests.cpp @@ -9,7 +9,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("async_manual_reset_event"); diff --git a/test/async_mutex_tests.cpp b/test/async_mutex_tests.cpp index 0e3427bb..0837e521 100644 --- a/test/async_mutex_tests.cpp +++ b/test/async_mutex_tests.cpp @@ -10,7 +10,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("async_mutex"); diff --git a/test/cancellation_token_tests.cpp b/test/cancellation_token_tests.cpp index 5c45968d..0684d764 100644 --- a/test/cancellation_token_tests.cpp +++ b/test/cancellation_token_tests.cpp @@ -11,7 +11,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("cancellation_token tests"); diff --git a/test/doctest/cppcoro_doctest.h b/test/doctest/cppcoro_doctest.h new file mode 100644 index 00000000..a0336015 --- /dev/null +++ b/test/doctest/cppcoro_doctest.h @@ -0,0 +1,11 @@ +/////////////////////////////////////////////////////////////////////////////// +// Copyright (c) Andreas Buhr +// Licenced under MIT license. See LICENSE.txt for details. +/////////////////////////////////////////////////////////////////////////////// +#ifndef CPPCORO_CPPCORO_DOCTEST_H_INCLUDED +#define CPPCORO_CPPCORO_DOCTEST_H_INCLUDED + +#define DOCTEST_CONFIG_USE_STD_HEADERS +#include "doctest.h" + +#endif \ No newline at end of file diff --git a/test/file_tests.cpp b/test/file_tests.cpp index 41836136..b2838bf9 100644 --- a/test/file_tests.cpp +++ b/test/file_tests.cpp @@ -21,7 +21,7 @@ #include "io_service_fixture.hpp" #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("file"); diff --git a/test/generator_tests.cpp b/test/generator_tests.cpp index 8b543ba7..92427dfa 100644 --- a/test/generator_tests.cpp +++ b/test/generator_tests.cpp @@ -12,7 +12,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("generator"); diff --git a/test/io_service_tests.cpp b/test/io_service_tests.cpp index 7ea21289..0e64f18f 100644 --- a/test/io_service_tests.cpp +++ b/test/io_service_tests.cpp @@ -18,7 +18,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("io_service"); diff --git a/test/ip_address_tests.cpp b/test/ip_address_tests.cpp index 22caea63..a09ae327 100644 --- a/test/ip_address_tests.cpp +++ b/test/ip_address_tests.cpp @@ -5,7 +5,7 @@ #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("ip_address"); diff --git a/test/ip_endpoint_tests.cpp b/test/ip_endpoint_tests.cpp index a26e4d3d..6eafaeba 100644 --- a/test/ip_endpoint_tests.cpp +++ b/test/ip_endpoint_tests.cpp @@ -6,7 +6,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("ip_endpoint"); diff --git a/test/ipv4_address_tests.cpp b/test/ipv4_address_tests.cpp index 75cd959c..d241657a 100644 --- a/test/ipv4_address_tests.cpp +++ b/test/ipv4_address_tests.cpp @@ -5,7 +5,7 @@ #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("ipv4_address"); diff --git a/test/ipv4_endpoint_tests.cpp b/test/ipv4_endpoint_tests.cpp index 0ec9253d..7d817bbb 100644 --- a/test/ipv4_endpoint_tests.cpp +++ b/test/ipv4_endpoint_tests.cpp @@ -5,7 +5,7 @@ #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("ip_endpoint"); diff --git a/test/ipv6_address_tests.cpp b/test/ipv6_address_tests.cpp index 8670df28..b8fd1322 100644 --- a/test/ipv6_address_tests.cpp +++ b/test/ipv6_address_tests.cpp @@ -5,7 +5,7 @@ #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("ipv6_address"); diff --git a/test/ipv6_endpoint_tests.cpp b/test/ipv6_endpoint_tests.cpp index 00ae1666..b72350f1 100644 --- a/test/ipv6_endpoint_tests.cpp +++ b/test/ipv6_endpoint_tests.cpp @@ -6,7 +6,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("ipv6_endpoint"); diff --git a/test/main.cpp b/test/main.cpp index b8fad77b..2956c4dc 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -4,4 +4,4 @@ /////////////////////////////////////////////////////////////////////////////// #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" diff --git a/test/multi_producer_sequencer_tests.cpp b/test/multi_producer_sequencer_tests.cpp index 070b4b01..0513ed63 100644 --- a/test/multi_producer_sequencer_tests.cpp +++ b/test/multi_producer_sequencer_tests.cpp @@ -18,7 +18,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" DOCTEST_TEST_SUITE_BEGIN("multi_producer_sequencer"); diff --git a/test/recursive_generator_tests.cpp b/test/recursive_generator_tests.cpp index 51343be4..14fce3c6 100644 --- a/test/recursive_generator_tests.cpp +++ b/test/recursive_generator_tests.cpp @@ -11,7 +11,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("recursive_generator"); diff --git a/test/scheduling_operator_tests.cpp b/test/scheduling_operator_tests.cpp index 19d666f7..1e3f0611 100644 --- a/test/scheduling_operator_tests.cpp +++ b/test/scheduling_operator_tests.cpp @@ -14,7 +14,7 @@ #include "io_service_fixture.hpp" #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("schedule/resume_on"); diff --git a/test/sequence_barrier_tests.cpp b/test/sequence_barrier_tests.cpp index 0ade4687..3097d511 100644 --- a/test/sequence_barrier_tests.cpp +++ b/test/sequence_barrier_tests.cpp @@ -15,7 +15,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" DOCTEST_TEST_SUITE_BEGIN("sequence_barrier"); diff --git a/test/shared_task_tests.cpp b/test/shared_task_tests.cpp index 7bf816cf..d76cbaa6 100644 --- a/test/shared_task_tests.cpp +++ b/test/shared_task_tests.cpp @@ -15,7 +15,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("shared_task"); diff --git a/test/single_consumer_async_auto_reset_event_tests.cpp b/test/single_consumer_async_auto_reset_event_tests.cpp index 54d32037..1ff9eeaa 100644 --- a/test/single_consumer_async_auto_reset_event_tests.cpp +++ b/test/single_consumer_async_auto_reset_event_tests.cpp @@ -17,7 +17,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("single_consumer_async_auto_reset_event"); diff --git a/test/single_producer_sequencer_tests.cpp b/test/single_producer_sequencer_tests.cpp index 88be3ffa..b4011470 100644 --- a/test/single_producer_sequencer_tests.cpp +++ b/test/single_producer_sequencer_tests.cpp @@ -17,7 +17,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" DOCTEST_TEST_SUITE_BEGIN("single_producer_sequencer"); diff --git a/test/socket_tests.cpp b/test/socket_tests.cpp index e51162d1..c8f0a928 100644 --- a/test/socket_tests.cpp +++ b/test/socket_tests.cpp @@ -13,7 +13,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" using namespace cppcoro; using namespace cppcoro::net; diff --git a/test/static_thread_pool_tests.cpp b/test/static_thread_pool_tests.cpp index ce93299d..0394a058 100644 --- a/test/static_thread_pool_tests.cpp +++ b/test/static_thread_pool_tests.cpp @@ -15,7 +15,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("static_thread_pool"); diff --git a/test/sync_wait_tests.cpp b/test/sync_wait_tests.cpp index 81f22507..37cc193f 100644 --- a/test/sync_wait_tests.cpp +++ b/test/sync_wait_tests.cpp @@ -14,7 +14,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("sync_wait"); diff --git a/test/task_tests.cpp b/test/task_tests.cpp index 96b821a7..68a0c0c9 100644 --- a/test/task_tests.cpp +++ b/test/task_tests.cpp @@ -15,7 +15,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("task"); diff --git a/test/when_all_ready_tests.cpp b/test/when_all_ready_tests.cpp index 1d8523a5..ff7ae97e 100644 --- a/test/when_all_ready_tests.cpp +++ b/test/when_all_ready_tests.cpp @@ -17,7 +17,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("when_all_ready"); diff --git a/test/when_all_tests.cpp b/test/when_all_tests.cpp index 1c616be8..721bcc10 100644 --- a/test/when_all_tests.cpp +++ b/test/when_all_tests.cpp @@ -20,7 +20,7 @@ #include #include -#include "doctest/doctest.h" +#include "doctest/cppcoro_doctest.h" TEST_SUITE_BEGIN("when_all");