From 5f4251e36812dc68bff9e59c012c1e2f7aa697f8 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Fri, 17 Sep 2021 09:20:07 +0200
Subject: Moved zenserverprocess into zenutil/zenserverprocess.h

---
 zenserver-test/zenserver-test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 8a634107d..6b4d39f89 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -19,7 +19,7 @@
 #include <zenhttp/httpclient.h>
 #include <zenhttp/httpshared.h>
 #include <zenhttp/zenhttp.h>
-#include <zenserverprocess.h>
+#include <zenutil/zenserverprocess.h>
 
 #include <mimalloc.h>
 
-- 
cgit v1.2.3


From 6da25650aa4bf87dcd5e3d612c615e0b8240015f Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Fri, 17 Sep 2021 09:54:50 +0200
Subject: Added namespace scopes to more includes for better consistency

---
 zenserver-test/zenserver-test.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 6b4d39f89..48bbacd80 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -657,20 +657,20 @@ main()
 }
 #else
 
-ZenServerEnvironment TestEnv;
+zen::ZenServerEnvironment TestEnv;
 
 int
 main(int argc, char** argv)
 {
 	mi_version();
 
-	zencore_forcelinktests();
+	zen::zencore_forcelinktests();
 	zen::zenhttp_forcelinktests();
 
 	zen::logging::InitializeLogging();
 
 	spdlog::set_level(spdlog::level::debug);
-	spdlog::set_formatter(std::make_unique<logging::full_formatter>("test", std::chrono::system_clock::now()));
+	spdlog::set_formatter(std::make_unique<::logging::full_formatter>("test", std::chrono::system_clock::now()));
 
 	std::filesystem::path ProgramBaseDir = std::filesystem::path(argv[0]).parent_path();
 	std::filesystem::path TestBaseDir	 = ProgramBaseDir.parent_path().parent_path() / ".test";
@@ -681,6 +681,8 @@ main(int argc, char** argv)
 	return doctest::Context(argc, argv).run();
 }
 
+namespace zen::tests {
+
 #	if 1
 TEST_CASE("asio.http")
 {
@@ -1771,4 +1773,5 @@ TEST_CASE("lifetime.owner.2")
 }
 #	endif
 
+}
 #endif
-- 
cgit v1.2.3