aboutsummaryrefslogtreecommitdiff
path: root/zenserver-test/zenserver-test.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-09-20 21:00:06 +0200
committerStefan Boberg <[email protected]>2021-09-20 21:00:06 +0200
commitbee86ccf35480b1ae3066659b5b2acc3a5906db9 (patch)
treee989a4fdc210c714ff078acb8fae2046f62a44f8 /zenserver-test/zenserver-test.cpp
parentImproved error handling in http.sys handler (diff)
downloadzen-bee86ccf35480b1ae3066659b5b2acc3a5906db9.tar.xz
zen-bee86ccf35480b1ae3066659b5b2acc3a5906db9.zip
Made use of mimalloc controlled by define
When ZEN_USE_MIMALLOC is set to 0, mimalloc will not be used. This is useful to diagnose issues with gflags and other generic analysis tools which expect malloc/free to be used for memory management
Diffstat (limited to 'zenserver-test/zenserver-test.cpp')
-rw-r--r--zenserver-test/zenserver-test.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 7cd2bb1d1..794a5fe94 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -22,7 +22,9 @@
#include <zenhttp/zenhttp.h>
#include <zenutil/zenserverprocess.h>
-#include <mimalloc.h>
+#if ZEN_USE_MIMALLOC
+# include <mimalloc.h>
+#endif
#include <http_parser.h>
@@ -666,7 +668,9 @@ zen::ZenServerEnvironment TestEnv;
int
main(int argc, char** argv)
{
+# if ZEN_USE_MIMALLOC
mi_version();
+# endif
zen::zencore_forcelinktests();
zen::zenhttp_forcelinktests();