Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Added some missing source files (including all SurrogateCpps) to CMake project.

Fixed up relative include paths to make this work.
Commit
30cebd617788f6b399297725f97317f9bc462114
Author
Phil Nash ·
Parents
e27c4ee04282

Files · Download .tar.gz

Changes

 projects/CMake/CMakeLists.txt                      | 62 ++++++++++++++--------
 projects/SelfTest/CmdLineTests.cpp                 |  2 +-
 projects/SelfTest/SurrogateCpps/catch_common.cpp   |  4 +-
 .../SurrogateCpps/catch_console_colour.cpp         |  4 +-
 projects/SelfTest/SurrogateCpps/catch_debugger.cpp |  2 +-
 .../SurrogateCpps/catch_interfaces_capture.cpp     |  4 +-
 .../SurrogateCpps/catch_interfaces_config.cpp      |  4 +-
 .../SurrogateCpps/catch_interfaces_exception.cpp   |  4 +-
 .../SurrogateCpps/catch_interfaces_generators.cpp  |  2 +-
 .../catch_interfaces_registry_hub.cpp              |  4 +-
 .../SurrogateCpps/catch_interfaces_reporter.cpp    |  4 +-
 .../SurrogateCpps/catch_interfaces_runner.cpp      |  2 +-
 .../SurrogateCpps/catch_interfaces_testcase.cpp    |  4 +-
 projects/SelfTest/SurrogateCpps/catch_message.cpp  |  4 +-
 projects/SelfTest/SurrogateCpps/catch_option.cpp   |  4 +-
 projects/SelfTest/SurrogateCpps/catch_ptr.cpp      |  4 +-
 projects/SelfTest/SurrogateCpps/catch_stream.cpp   |  4 +-
 .../SelfTest/SurrogateCpps/catch_streambuf.cpp     |  4 +-
 .../SelfTest/SurrogateCpps/catch_test_spec.cpp     |  4 +-
 .../SelfTest/SurrogateCpps/catch_xmlwriter.cpp     |  6 +--
 20 files changed, 76 insertions(+), 56 deletions(-)

diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt
index 960d9fb1..f4fb704f 100644
--- a/projects/CMake/CMakeLists.txt
+++ b/projects/CMake/CMakeLists.txt
@@ -7,31 +7,51 @@ get_filename_component(CATCH_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PATH)
 get_filename_component(CATCH_DIR "${CATCH_DIR}" PATH)
 set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest)
 if(USE_CPP11)
-  ## We can't turn this on by default, since it breaks on travis
-  message(STATUS "Enabling C++11")
-  set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+    ## We can't turn this on by default, since it breaks on travis
+    message(STATUS "Enabling C++11")
+    set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
 endif()
 
 # define the sources of the self test
 set(SOURCES
-    ${SELF_TEST_DIR}/ApproxTests.cpp
-    ${SELF_TEST_DIR}/BDDTests.cpp
-    ${SELF_TEST_DIR}/ClassTests.cpp
-    ${SELF_TEST_DIR}/ConditionTests.cpp
-    ${SELF_TEST_DIR}/ExceptionTests.cpp
-    ${SELF_TEST_DIR}/GeneratorTests.cpp
-    ${SELF_TEST_DIR}/MessageTests.cpp
-    ${SELF_TEST_DIR}/MiscTests.cpp
-    ${SELF_TEST_DIR}/PartTrackerTests.cpp
-    ${SELF_TEST_DIR}/TestMain.cpp
-    ${SELF_TEST_DIR}/TrickyTests.cpp
-    ${SELF_TEST_DIR}/VariadicMacrosTests.cpp
-    ${SELF_TEST_DIR}/EnumToString.cpp
-    ${SELF_TEST_DIR}/ToStringPair.cpp
-    ${SELF_TEST_DIR}/ToStringVector.cpp
-    ${SELF_TEST_DIR}/ToStringWhich.cpp
-    ${SELF_TEST_DIR}/ToStringTuple.cpp
-)
+        ${SELF_TEST_DIR}/ApproxTests.cpp
+        ${SELF_TEST_DIR}/BDDTests.cpp
+        ${SELF_TEST_DIR}/ClassTests.cpp
+        ${SELF_TEST_DIR}/ConditionTests.cpp
+        ${SELF_TEST_DIR}/ExceptionTests.cpp
+        ${SELF_TEST_DIR}/GeneratorTests.cpp
+        ${SELF_TEST_DIR}/MessageTests.cpp
+        ${SELF_TEST_DIR}/MiscTests.cpp
+        ${SELF_TEST_DIR}/PartTrackerTests.cpp
+        ${SELF_TEST_DIR}/TestMain.cpp
+        ${SELF_TEST_DIR}/TrickyTests.cpp
+        ${SELF_TEST_DIR}/VariadicMacrosTests.cpp
+        ${SELF_TEST_DIR}/EnumToString.cpp
+        ${SELF_TEST_DIR}/ToStringPair.cpp
+        ${SELF_TEST_DIR}/ToStringVector.cpp
+        ${SELF_TEST_DIR}/ToStringWhich.cpp
+        ${SELF_TEST_DIR}/ToStringTuple.cpp
+        ${SELF_TEST_DIR}/CmdLineTests.cpp
+        ${SELF_TEST_DIR}/TagAliasTests.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_common.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_console_colour.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_debugger.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_capture.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_config.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_exception.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_generators.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_registry_hub.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_reporter.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_runner.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_testcase.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_message.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_option.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_ptr.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_stream.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_streambuf.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_test_spec.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_xmlwriter.cpp
+        )
 
 # configure the executable
 include_directories(${CATCH_DIR}/include)
diff --git a/projects/SelfTest/CmdLineTests.cpp b/projects/SelfTest/CmdLineTests.cpp
index 719c89b8..83b79fde 100644
--- a/projects/SelfTest/CmdLineTests.cpp
+++ b/projects/SelfTest/CmdLineTests.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "catch.hpp"
-#include "catch_test_spec_parser.hpp"
+#include "internal/catch_test_spec_parser.hpp"
 
 #ifdef __clang__
 #   pragma clang diagnostic ignored "-Wc++98-compat"
diff --git a/projects/SelfTest/SurrogateCpps/catch_common.cpp b/projects/SelfTest/SurrogateCpps/catch_common.cpp
index 72f90bd6..65377f30 100644
--- a/projects/SelfTest/SurrogateCpps/catch_common.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_common.cpp
@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
-#include "catch_common.h"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_common.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp b/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp
index e7378c04..c28aa011 100644
--- a/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp
@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
-#include "catch_console_colour.hpp"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_console_colour.hpp"
diff --git a/projects/SelfTest/SurrogateCpps/catch_debugger.cpp b/projects/SelfTest/SurrogateCpps/catch_debugger.cpp
index 33f76ae6..04f4e071 100644
--- a/projects/SelfTest/SurrogateCpps/catch_debugger.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_debugger.cpp
@@ -1,2 +1,2 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_debugger.h"
+#include "internal/catch_debugger.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_interfaces_capture.cpp b/projects/SelfTest/SurrogateCpps/catch_interfaces_capture.cpp
index 2d1c8f35..f46dae48 100644
--- a/projects/SelfTest/SurrogateCpps/catch_interfaces_capture.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_interfaces_capture.cpp
@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
-#include "catch_interfaces_capture.h"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_interfaces_capture.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_interfaces_config.cpp b/projects/SelfTest/SurrogateCpps/catch_interfaces_config.cpp
index de0f18d3..46f80e86 100644
--- a/projects/SelfTest/SurrogateCpps/catch_interfaces_config.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_interfaces_config.cpp
@@ -1,2 +1,2 @@
-#include "catch_suppress_warnings.h"
-#include "catch_interfaces_config.h"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_interfaces_config.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_interfaces_exception.cpp b/projects/SelfTest/SurrogateCpps/catch_interfaces_exception.cpp
index 183d87d9..f5ad4870 100644
--- a/projects/SelfTest/SurrogateCpps/catch_interfaces_exception.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_interfaces_exception.cpp
@@ -1,2 +1,2 @@
-#include "catch_suppress_warnings.h"
-#include "catch_interfaces_exception.h"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_interfaces_exception.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_interfaces_generators.cpp b/projects/SelfTest/SurrogateCpps/catch_interfaces_generators.cpp
index 271b1bcc..2eda9812 100644
--- a/projects/SelfTest/SurrogateCpps/catch_interfaces_generators.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_interfaces_generators.cpp
@@ -1 +1 @@
-#include "catch_interfaces_generators.h"
+#include "internal/catch_interfaces_generators.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_interfaces_registry_hub.cpp b/projects/SelfTest/SurrogateCpps/catch_interfaces_registry_hub.cpp
index ffece3b4..b399d862 100644
--- a/projects/SelfTest/SurrogateCpps/catch_interfaces_registry_hub.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_interfaces_registry_hub.cpp
@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
-#include "catch_interfaces_registry_hub.h"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_interfaces_registry_hub.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp b/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp
index 544f9d0f..f3c71585 100644
--- a/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp
@@ -1,2 +1,2 @@
-#include "catch_suppress_warnings.h"
-#include "catch_interfaces_reporter.h"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_interfaces_reporter.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_interfaces_runner.cpp b/projects/SelfTest/SurrogateCpps/catch_interfaces_runner.cpp
index 401de262..800f32ab 100644
--- a/projects/SelfTest/SurrogateCpps/catch_interfaces_runner.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_interfaces_runner.cpp
@@ -1 +1 @@
-#include "catch_interfaces_runner.h"
+#include "internal/catch_interfaces_runner.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_interfaces_testcase.cpp b/projects/SelfTest/SurrogateCpps/catch_interfaces_testcase.cpp
index 733dcb4e..0d6903cc 100644
--- a/projects/SelfTest/SurrogateCpps/catch_interfaces_testcase.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_interfaces_testcase.cpp
@@ -1,2 +1,2 @@
-#include "catch_suppress_warnings.h"
-#include "catch_interfaces_testcase.h"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_interfaces_testcase.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_message.cpp b/projects/SelfTest/SurrogateCpps/catch_message.cpp
index ad2f5e77..40f4403c 100644
--- a/projects/SelfTest/SurrogateCpps/catch_message.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_message.cpp
@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
-#include "catch_message.h"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_message.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_option.cpp b/projects/SelfTest/SurrogateCpps/catch_option.cpp
index 35e32829..a4ca37c2 100644
--- a/projects/SelfTest/SurrogateCpps/catch_option.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_option.cpp
@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
-#include "catch_option.hpp"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_option.hpp"
diff --git a/projects/SelfTest/SurrogateCpps/catch_ptr.cpp b/projects/SelfTest/SurrogateCpps/catch_ptr.cpp
index a25ad66d..90796ca1 100644
--- a/projects/SelfTest/SurrogateCpps/catch_ptr.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_ptr.cpp
@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
-#include "catch_ptr.hpp"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_ptr.hpp"
diff --git a/projects/SelfTest/SurrogateCpps/catch_stream.cpp b/projects/SelfTest/SurrogateCpps/catch_stream.cpp
index 7aaffa1e..a76d8413 100644
--- a/projects/SelfTest/SurrogateCpps/catch_stream.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_stream.cpp
@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
-#include "catch_stream.h"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_stream.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_streambuf.cpp b/projects/SelfTest/SurrogateCpps/catch_streambuf.cpp
index 5c0043c2..a9222e4b 100644
--- a/projects/SelfTest/SurrogateCpps/catch_streambuf.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_streambuf.cpp
@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
-#include "catch_streambuf.h"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_streambuf.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp b/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp
index 46bf89f6..9993b80a 100644
--- a/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp
@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
-#include "catch_test_spec.hpp"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_test_spec.hpp"
diff --git a/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp b/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
index 15328efe..169d2d70 100644
--- a/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
@@ -1,4 +1,4 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
-#include "catch_xmlwriter.hpp"
-#include "catch_reenable_warnings.h"
+#include "internal/catch_suppress_warnings.h"
+#include "internal/catch_xmlwriter.hpp"
+#include "internal/catch_reenable_warnings.h"