Merge branch 'main' into lm/oidctoken-exe-path

1 files changed, 2 insertions, 34 deletions

diff --git a/src/zencore-test/zencore-test.cpp b/src/zencore-test/zencore-test.cpp
index 68fc940ee..3d9a79283 100644
--- a/src/zencore-test/zencore-test.cpp
+++ b/src/zencore-test/zencore-test.cpp
@@ -1,47 +1,15 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-// zencore-test.cpp : Defines the entry point for the console application.
-//
-
-#include <zencore/filesystem.h>
-#include <zencore/logging.h>
-#include <zencore/trace.h>
+#include <zencore/testing.h>
 #include <zencore/zencore.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::zencore_forcelinktests();
-
-#	if ZEN_PLATFORM_LINUX
-	zen::IgnoreChildSignals();
-#	endif
-
-#	if ZEN_WITH_TRACE
-	zen::TraceInit("zencore-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, "zencore-test", zen::zencore_forcelinktests);
 #else
 	return 0;
 #endif