From 4d01aaee0a45f4c9f96e8a4925eff696be98de8d Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan.boberg@epicgames.com>
Date: Sun, 1 Mar 2026 12:40:20 +0100
Subject: added `--verbose` option to zenserver-test and `xmake test` (#798)

* when `--verbose` is specified to zenserver-test, all child process output (typically, zenserver instances) is piped through to stdout. you can also pass `--verbose` to `xmake test` to accomplish the same thing.
* this PR also consolidates all test runner `main` function logic (such as from zencore-test, zenhttp-test etc) into central implementation in zencore for consistency and ease of maintenance
* also added extended utf8-tests including a fix to `Utf8ToWide()`
---
 src/zenutil-test/zenutil-test.cpp | 34 ++--------------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

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

diff --git a/src/zenutil-test/zenutil-test.cpp b/src/zenutil-test/zenutil-test.cpp
index f5cfd5a72..e2b6ac9bd 100644
--- a/src/zenutil-test/zenutil-test.cpp
+++ b/src/zenutil-test/zenutil-test.cpp
@@ -1,45 +1,15 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include <zencore/filesystem.h>
-#include <zencore/logging.h>
-#include <zencore/trace.h>
+#include <zencore/testing.h>
 #include <zenutil/zenutil.h>
 
 #include <zencore/memory/newdelete.h>
 
-#if ZEN_WITH_TESTS
-#	define ZEN_TEST_WITH_RUNNER 1
-#	include <zencore/testing.h>
-#	include <zencore/process.h>
-#endif
-
 int
 main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
 {
-#if ZEN_PLATFORM_WINDOWS
-	setlocale(LC_ALL, "en_us.UTF8");
-#endif	// ZEN_PLATFORM_WINDOWS
-
 #if ZEN_WITH_TESTS
-	zen::zenutil_forcelinktests();
-
-#	if ZEN_PLATFORM_LINUX
-	zen::IgnoreChildSignals();
-#	endif
-
-#	if ZEN_WITH_TRACE
-	zen::TraceInit("zenutil-test");
-	zen::TraceOptions TraceCommandlineOptions;
-	if (GetTraceOptionsFromCommandline(TraceCommandlineOptions))
-	{
-		TraceConfigure(TraceCommandlineOptions);
-	}
-#	endif	// ZEN_WITH_TRACE
-
-	zen::logging::InitializeLogging();
-	zen::MaximizeOpenFileCount();
-
-	return ZEN_RUN_TESTS(argc, argv);
+	return zen::testing::RunTestMain(argc, argv, "zenutil-test", zen::zenutil_forcelinktests);
 #else
 	return 0;
 #endif
-- 
cgit v1.2.3