diff options
| author | Per Larsson <[email protected]> | 2021-09-20 10:28:38 +0200 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-09-20 10:28:38 +0200 |
| commit | d7e8b3f1435ba50f50393692763508f3224aa9b1 (patch) | |
| tree | ee4357d70cdb9ea1fbcc3836d859cf39fe8e2f42 /zenserver-test | |
| parent | Added support for skipping package attachments. (diff) | |
| parent | trivial: include cleanup (diff) | |
| download | zen-d7e8b3f1435ba50f50393692763508f3224aa9b1.tar.xz zen-d7e8b3f1435ba50f50393692763508f3224aa9b1.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zenserver-test')
| -rw-r--r-- | zenserver-test/zenserver-test.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp index 3ca5747f5..dca583399 100644 --- a/zenserver-test/zenserver-test.cpp +++ b/zenserver-test/zenserver-test.cpp @@ -51,9 +51,11 @@ ////////////////////////////////////////////////////////////////////////// -#define DOCTEST_CONFIG_IMPLEMENT -#include <doctest/doctest.h> -#undef DOCTEST_CONFIG_IMPLEMENT +#if ZEN_WITH_TESTS +# define DOCTEST_CONFIG_IMPLEMENT +# include <zencore/testing.h> +# undef DOCTEST_CONFIG_IMPLEMENT +#endif using namespace fmt::literals; @@ -657,7 +659,7 @@ main() [](auto req) { return req->create_response().set_body("Hello, World!").done(); })); return 0; } -#else +#elif ZEN_WITH_TESTS zen::ZenServerEnvironment TestEnv; @@ -2109,4 +2111,9 @@ TEST_CASE("lifetime.owner.2") # endif } // namespace zen::tests +#else +int +main() +{ +} #endif |