From 271344dd6b355f91ad7f87fbcf029a5039ae84c1 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Wed, 27 Feb 2019 17:33:10 +0100 Subject: [PATCH] Re-enabled unit-tests, updated catch2, started loader test --- CMakeLists.txt | 2 +- conanfile.txt | 2 +- test/CMakeLists.txt | 1 + test/loadfile.cpp | 6 ++++++ 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 test/loadfile.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index a731ba0..80cab7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,4 +12,4 @@ include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup() add_subdirectory(source) -#add_subdirectory(test) +add_subdirectory(test) diff --git a/conanfile.txt b/conanfile.txt index e405607..937b98c 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -2,7 +2,7 @@ qt/5.12.0@bincrafters/stable protobuf/3.6.1@bincrafters/stable protoc_installer/3.6.1@bincrafters/stable -catch2/2.4.2@bincrafters/stable +catch2/2.5.0@bincrafters/stable [generators] cmake diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5984746..fe37a19 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -7,6 +7,7 @@ add_executable(${PROJECT_NAME} main.cpp dummy.cpp Age.cpp + loadfile.cpp ) target_link_libraries(${PROJECT_NAME} diff --git a/test/loadfile.cpp b/test/loadfile.cpp new file mode 100644 index 0000000..394e5d7 --- /dev/null +++ b/test/loadfile.cpp @@ -0,0 +1,6 @@ +#include + +TEST_CASE("blah") +{ + REQUIRE(true); +}