From 21f3041bfb6729c674bfbd4c45e107728279f9e2 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 20 Feb 2020 21:16:33 +0100 Subject: [PATCH] Runtime test execution added to Conan --- conanfile.py | 2 +- test/unit_test/runtime/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index eb7175ec..190f0191 100644 --- a/conanfile.py +++ b/conanfile.py @@ -92,7 +92,7 @@ class UnitsConan(ConanFile): cmake = self._configure_cmake() cmake.build() if self._run_tests: - self.run("ctest -VV -C %s" % cmake.build_type, run_environment=True) + cmake.test() def package(self): self.copy(pattern="LICENSE.md", dst="licenses") diff --git a/test/unit_test/runtime/CMakeLists.txt b/test/unit_test/runtime/CMakeLists.txt index 27ab610a..cbbb78c4 100644 --- a/test/unit_test/runtime/CMakeLists.txt +++ b/test/unit_test/runtime/CMakeLists.txt @@ -35,3 +35,7 @@ target_link_libraries(unit_tests_runtime mp::units CONAN_PKG::Catch2 ) + +include(CTest) +include(lib/cmake/Catch2/Catch) +catch_discover_tests(unit_tests_runtime)