aboutsummaryrefslogtreecommitdiff
path: root/src/zenutil-test
diff options
context:
space:
mode:
authorLiam Mitchell <[email protected]>2026-03-09 19:06:36 -0700
committerLiam Mitchell <[email protected]>2026-03-09 19:06:36 -0700
commitd1abc50ee9d4fb72efc646e17decafea741caa34 (patch)
treee4288e00f2f7ca0391b83d986efcb69d3ba66a83 /src/zenutil-test
parentAllow requests with invalid content-types unless specified in command line or... (diff)
parentupdated chunk–block analyser (#818) (diff)
downloadzen-d1abc50ee9d4fb72efc646e17decafea741caa34.tar.xz
zen-d1abc50ee9d4fb72efc646e17decafea741caa34.zip
Merge branch 'main' into lm/restrict-content-type
Diffstat (limited to 'src/zenutil-test')
-rw-r--r--src/zenutil-test/zenutil-test.cpp34
1 files changed, 2 insertions, 32 deletions
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