add doctest include wrapper to avoid linker problems

lewissbaker · Oct 12, 2020 · 6859698 · 6859698
1 parent ff01094
commit 6859698
Show file tree

Hide file tree

Showing 30 changed files with 41 additions and 29 deletions.
diff --git a/test/async_auto_reset_event_tests.cpp b/test/async_auto_reset_event_tests.cpp
@@ -18,7 +18,7 @@
 #include <vector>
 
 #include <ostream>
-#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
@@ -10,7 +10,7 @@
 #include <cppcoro/when_all.hpp>
 
 #include <ostream>
-#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
@@ -10,7 +10,7 @@
 #include <cppcoro/sync_wait.hpp>
 
 #include <ostream>
-#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
@@ -9,7 +9,7 @@
 #include <cppcoro/sync_wait.hpp>
 #include <cppcoro/when_all_ready.hpp>
 
-#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
@@ -10,7 +10,7 @@
 #include <cppcoro/sync_wait.hpp>
 
 #include <ostream>
-#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
@@ -11,7 +11,7 @@
 #include <thread>
 
 #include <ostream>
-#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
@@ -0,0 +1,12 @@
+///////////////////////////////////////////////////////////////////////////////
+// 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
+
diff --git a/test/file_tests.cpp b/test/file_tests.cpp
@@ -21,7 +21,7 @@
 #include "io_service_fixture.hpp"
 
 #include <ostream>
-#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
@@ -12,7 +12,7 @@
 #include <string>
 #include <forward_list>
 
-#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
@@ -18,7 +18,7 @@
 #include <vector>
 
 #include <ostream>
-#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
@@ -5,7 +5,7 @@
 
 #include <cppcoro/net/ip_address.hpp>
 
-#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
@@ -6,7 +6,7 @@
 #include <cppcoro/config.hpp>
 #include <cppcoro/net/ip_endpoint.hpp>
 
-#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
@@ -5,7 +5,7 @@
 
 #include <cppcoro/net/ipv4_address.hpp>
 
-#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
@@ -5,7 +5,7 @@
 
 #include <cppcoro/net/ipv4_endpoint.hpp>
 
-#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
@@ -5,7 +5,7 @@
 
 #include <cppcoro/net/ipv6_address.hpp>
 
-#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
@@ -6,7 +6,7 @@
 #include <cppcoro/config.hpp>
 #include <cppcoro/net/ipv6_endpoint.hpp>
 
-#include "doctest/doctest.h"
+#include "doctest/cppcoro_doctest.h"
 
 TEST_SUITE_BEGIN("ipv6_endpoint");
 

diff --git 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
@@ -18,7 +18,7 @@
 #include <chrono>
 
 #include <ostream>
-#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
@@ -11,7 +11,7 @@
 #include <algorithm>
 
 #include <ostream>
-#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
@@ -14,7 +14,7 @@
 #include "io_service_fixture.hpp"
 
 #include <ostream>
-#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
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <thread>
 
-#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
@@ -15,7 +15,7 @@
 #include <ostream>
 #include <string>
 
-#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
@@ -17,7 +17,7 @@
 #include <cassert>
 #include <vector>
 
-#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
@@ -17,7 +17,7 @@
 #include <thread>
 
 #include <ostream>
-#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
@@ -13,7 +13,7 @@
 #include <cppcoro/cancellation_token.hpp>
 #include <cppcoro/async_scope.hpp>
 
-#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
@@ -15,7 +15,7 @@
 #include <iostream>
 #include <numeric>
 
-#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
@@ -14,7 +14,7 @@
 #include <string>
 #include <type_traits>
 
-#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
@@ -15,7 +15,7 @@
 #include <string>
 #include <type_traits>
 
-#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
@@ -17,7 +17,7 @@
 #include <vector>
 
 #include <ostream>
-#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
@@ -20,7 +20,7 @@
 #include <vector>
 
 #include <ostream>
-#include "doctest/doctest.h"
+#include "doctest/cppcoro_doctest.h"
 
 TEST_SUITE_BEGIN("when_all");