From 5f42f759e12364c07f137ee6523925b5f8d02edc Mon Sep 17 00:00:00 2001 From: Pascal Thomet Date: Sun, 5 Jun 2016 13:29:04 +0200 Subject: [PATCH] Add DocTestRegister.cpp as a library file (should register all files that contain testst) Call it from doctest_main.cpp --- MyLibrary/CMakeLists.txt | 2 +- MyLibrary/DocTestRegister.cpp | 11 +++++++++++ MyLibrary/lib1.cpp | 2 +- MyLibrary/lib2.cpp | 2 +- doctest_main/doctest_main.cpp | 7 ++----- 5 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 MyLibrary/DocTestRegister.cpp diff --git a/MyLibrary/CMakeLists.txt b/MyLibrary/CMakeLists.txt index bffe7f1..c7850e4 100644 --- a/MyLibrary/CMakeLists.txt +++ b/MyLibrary/CMakeLists.txt @@ -1,4 +1,4 @@ -set(sources lib1.cpp lib2.cpp) +set(sources lib1.cpp lib2.cpp DocTestRegister.cpp) add_library(MyLibrary STATIC ${sources}) set_property(TARGET MyLibrary PROPERTY CXX_STANDARD 11) target_include_directories(MyLibrary PUBLIC ${CMAKE_SOURCE_DIR}/doctest/doctest ) diff --git a/MyLibrary/DocTestRegister.cpp b/MyLibrary/DocTestRegister.cpp new file mode 100644 index 0000000..ca8347a --- /dev/null +++ b/MyLibrary/DocTestRegister.cpp @@ -0,0 +1,11 @@ + +int DocTestRegister_lib1(); +int DocTestRegister_lib2(); + +int DocTestRegister() +{ + int sum; + sum += DocTestRegister_lib1(); + sum += DocTestRegister_lib2(); + return sum; +} \ No newline at end of file diff --git a/MyLibrary/lib1.cpp b/MyLibrary/lib1.cpp index 94e6269..132efa5 100644 --- a/MyLibrary/lib1.cpp +++ b/MyLibrary/lib1.cpp @@ -2,7 +2,7 @@ #define DEBUG // Quick hack against DOCTEST_BREAK_INTO_DEBUGGER not being defined #include "doctest.h" -int DocTestRegister1() { +int DocTestRegister_lib1() { return 1; } diff --git a/MyLibrary/lib2.cpp b/MyLibrary/lib2.cpp index 7947ce8..9e2f3f1 100644 --- a/MyLibrary/lib2.cpp +++ b/MyLibrary/lib2.cpp @@ -3,7 +3,7 @@ #include "doctest.h" -int DocTestRegister2() { +int DocTestRegister_lib2() { return 1; } diff --git a/doctest_main/doctest_main.cpp b/doctest_main/doctest_main.cpp index 26045e9..d1da7e7 100644 --- a/doctest_main/doctest_main.cpp +++ b/doctest_main/doctest_main.cpp @@ -1,9 +1,7 @@ #define DOCTEST_CONFIG_IMPLEMENT #include "doctest.h" - -int DocTestRegister1(); -int DocTestRegister2(); +int DocTestRegister(); int main(int argc, char** argv) { doctest::Context context(argc, argv); @@ -12,7 +10,6 @@ int main(int argc, char** argv) { if(context.shouldExit()) return res; - DocTestRegister1(); - DocTestRegister2(); + DocTestRegister(); return res; }