aboutsummaryrefslogtreecommitdiff
path: root/zencore-test
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2022-04-05 15:58:41 +0200
committerStefan Boberg <[email protected]>2022-04-05 15:58:41 +0200
commitca6516d1b552c5d6959aac3abc84cf3ee02393b6 (patch)
treebe3559834a28603871d79bdb0f6332d9b09349b2 /zencore-test
parentFix gc shutdown stalling if shutting down while gc is running (diff)
downloadzen-ca6516d1b552c5d6959aac3abc84cf3ee02393b6.tar.xz
zen-ca6516d1b552c5d6959aac3abc84cf3ee02393b6.zip
Added option to use Catch2 framework for tests
Diffstat (limited to 'zencore-test')
-rw-r--r--zencore-test/xmake.lua1
-rw-r--r--zencore-test/zencore-test.cpp5
2 files changed, 3 insertions, 3 deletions
diff --git a/zencore-test/xmake.lua b/zencore-test/xmake.lua
index 74c7e74a7..2556a1399 100644
--- a/zencore-test/xmake.lua
+++ b/zencore-test/xmake.lua
@@ -5,4 +5,5 @@ target("zencore-test")
add_headerfiles("**.h")
add_files("*.cpp")
add_deps("zencore")
+ add_packages("vcpkg::catch2")
add_packages("vcpkg::doctest")
diff --git a/zencore-test/zencore-test.cpp b/zencore-test/zencore-test.cpp
index cd4ce3e0a..37f309be0 100644
--- a/zencore-test/zencore-test.cpp
+++ b/zencore-test/zencore-test.cpp
@@ -5,9 +5,8 @@
#include <zencore/zencore.h>
#if ZEN_WITH_TESTS
-# define DOCTEST_CONFIG_IMPLEMENT
+# define ZEN_TEST_WITH_RUNNER 1
# include <zencore/testing.h>
-# undef DOCTEST_CONFIG_IMPLEMENT
#endif
int
@@ -18,7 +17,7 @@ main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
zen::logging::InitializeLogging();
- return doctest::Context(argc, argv).run();
+ return ZEN_RUN_TESTS(argc, argv);
#else
return 0;
#endif