From 45bfc721dd049193abf3b2be2aa7b097466ddbe9 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Thu, 14 Mar 2024 16:33:17 +0100
Subject: clean up test linking (#4)

- Improvement: Add zenhttp-test and zenutil-test
- Improvement: Moved cachepolicy test to cachepolicy.cpp
- Improvement: Renamed cachestore tests from z$ to cachestore
- Improvement: Moved test linking so test for a lib is linked by <lib>-test
- Improvement: Removed HttpRequestParseRelativeUri in httpstructuredcache.cpp and use the one in cacherequests.h instead
---
 src/zenserver-test/zenserver-test.cpp | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'src/zenserver-test/zenserver-test.cpp')

diff --git a/src/zenserver-test/zenserver-test.cpp b/src/zenserver-test/zenserver-test.cpp
index 9074485b6..4a368c992 100644
--- a/src/zenserver-test/zenserver-test.cpp
+++ b/src/zenserver-test/zenserver-test.cpp
@@ -27,12 +27,6 @@
 #include <zenutil/packageformat.h>
 #include <zenutil/zenserverprocess.h>
 
-#if ZEN_USE_MIMALLOC
-ZEN_THIRD_PARTY_INCLUDES_START
-#	include <mimalloc.h>
-ZEN_THIRD_PARTY_INCLUDES_END
-#endif
-
 #include <http_parser.h>
 
 #if ZEN_PLATFORM_WINDOWS
@@ -59,6 +53,12 @@ ZEN_THIRD_PARTY_INCLUDES_END
 #	include <process.h>
 #endif
 
+#if ZEN_USE_MIMALLOC
+ZEN_THIRD_PARTY_INCLUDES_START
+#	include <mimalloc-new-delete.h>
+ZEN_THIRD_PARTY_INCLUDES_END
+#endif
+
 //////////////////////////////////////////////////////////////////////////
 
 #include "projectclient.h"
@@ -100,16 +100,11 @@ zen::ZenServerEnvironment TestEnv;
 int
 main(int argc, char** argv)
 {
-	using namespace std::literals;
-	using namespace zen;
-
 #	if ZEN_USE_MIMALLOC
 	mi_version();
 #	endif
-
-	zencore_forcelinktests();
-	zenhttp_forcelinktests();
-	cacherequests_forcelink();
+	using namespace std::literals;
+	using namespace zen;
 
 	zen::logging::InitializeLogging();
 
-- 
cgit v1.2.3