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/zencompute-test/zencompute-test.cpp | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

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

diff --git a/src/zencompute-test/zencompute-test.cpp b/src/zencompute-test/zencompute-test.cpp
index 237812e12..60aaeab1d 100644
--- a/src/zencompute-test/zencompute-test.cpp
+++ b/src/zencompute-test/zencompute-test.cpp
@@ -1,31 +1,15 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
 #include <zencompute/zencompute.h>
-#include <zencore/filesystem.h>
-#include <zencore/logging.h>
-#include <zencore/zencore.h>
+#include <zencore/testing.h>
 
-#if ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC
-#	include <sys/time.h>
-#	include <sys/resource.h>
-#	include <zencore/except.h>
-#endif
-
-#if ZEN_WITH_TESTS
-#	define ZEN_TEST_WITH_RUNNER 1
-#	include <zencore/testing.h>
-#endif
+#include <zencore/memory/newdelete.h>
 
 int
 main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
 {
 #if ZEN_WITH_TESTS
-	zen::zencompute_forcelinktests();
-
-	zen::logging::InitializeLogging();
-	zen::MaximizeOpenFileCount();
-
-	return ZEN_RUN_TESTS(argc, argv);
+	return zen::testing::RunTestMain(argc, argv, "zencompute-test", zen::zencompute_forcelinktests);
 #else
 	return 0;
 #endif
-- 
cgit v1.2.3