[catch] Package Catch test runner as a CMake object library for reuse

eggs-cpp · Dec 31, 2017 · 6ffbe3d · 6ffbe3d
1 parent 1c2857b
commit 6ffbe3d
Show file tree

Hide file tree

Showing 25 changed files with 12 additions and 24 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -5,6 +5,8 @@
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+add_library(Catch2 OBJECT catch.cpp)
+
 set(_tests
   apply
   assign.conversion
@@ -30,7 +32,7 @@ set(_tests
   rel.order
   swap)
 foreach (_test ${_tests})
-  add_executable(test.${_test} ${_test}.cpp)
+  add_executable(test.${_test} ${_test}.cpp $<TARGET_OBJECTS:Catch2>)
   target_link_libraries(test.${_test} Eggs::Variant)
 
   add_test(NAME test.${_test} COMMAND test.${_test})

diff --git a/test/apply.cpp b/test/apply.cpp
@@ -14,7 +14,6 @@
 
 using eggs::variants::detail::move;
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/assign.conversion.cpp b/test/assign.conversion.cpp
@@ -11,7 +11,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 #include "dtor.hpp"

diff --git a/test/assign.copy.cpp b/test/assign.copy.cpp
@@ -14,7 +14,6 @@
 
 using eggs::variants::detail::move;
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 #include "dtor.hpp"

diff --git a/test/assign.emplace.cpp b/test/assign.emplace.cpp
@@ -12,7 +12,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 #include "dtor.hpp"

diff --git a/test/assign.move.cpp b/test/assign.move.cpp
@@ -14,7 +14,6 @@
 
 using eggs::variants::detail::move;
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 #include "dtor.hpp"

diff --git a/test/catch.cpp b/test/catch.cpp
@@ -0,0 +1,9 @@
+// Eggs.Variant
+//
+// Copyright Agustin K-ballo Berge, Fusion Fenix 2014-2017
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
diff --git a/test/cnstr.conversion.cpp b/test/cnstr.conversion.cpp
@@ -12,7 +12,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/cnstr.copy.cpp b/test/cnstr.copy.cpp
@@ -14,7 +14,6 @@
 
 using eggs::variants::detail::move;
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/cnstr.default.cpp b/test/cnstr.default.cpp
@@ -10,7 +10,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/cnstr.emplace.cpp b/test/cnstr.emplace.cpp
@@ -11,7 +11,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/cnstr.move.cpp b/test/cnstr.move.cpp
@@ -14,7 +14,6 @@
 
 using eggs::variants::detail::move;
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/dtor.cpp b/test/dtor.cpp
@@ -10,7 +10,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "dtor.hpp"
 

diff --git a/test/elem.get.cpp b/test/elem.get.cpp
@@ -13,7 +13,6 @@
 
 using eggs::variants::detail::move;
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/elem.get_if.cpp b/test/elem.get_if.cpp
@@ -10,7 +10,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/hash.cpp b/test/hash.cpp
@@ -13,7 +13,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 
 #if EGGS_CXX11_HAS_SFINAE_FOR_EXPRESSIONS

diff --git a/test/helper.cpp b/test/helper.cpp
@@ -11,7 +11,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 
 template <class T, class = void>

diff --git a/test/in_place.cpp b/test/in_place.cpp
@@ -12,7 +12,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 
 struct fun_index

diff --git a/test/obs.bool.cpp b/test/obs.bool.cpp
@@ -10,7 +10,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/obs.target.cpp b/test/obs.target.cpp
@@ -11,7 +11,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/obs.target_type.cpp b/test/obs.target_type.cpp
@@ -11,7 +11,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/obs.which.cpp b/test/obs.which.cpp
@@ -10,7 +10,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/rel.equality.cpp b/test/rel.equality.cpp
@@ -13,7 +13,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/rel.order.cpp b/test/rel.order.cpp
@@ -13,7 +13,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 

diff --git a/test/swap.cpp b/test/swap.cpp
@@ -12,7 +12,6 @@
 
 #include <eggs/variant/detail/config/prefix.hpp>
 
-#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "constexpr.hpp"
 #include "dtor.hpp"