Add test suites (#799)

Makes all test cases part of a test suite. Test suites are named after the module and the name of the file containing the implementation of the test.

* This allows for better and more predictable filtering of which test cases to run which should also be able to reduce the time CI spends in tests since it can filter on the tests for that particular module.

Also improves `xmake test` behaviour:

* instead of an explicit list of projects just enumerate the test projects which are available based on build system state
* also introduces logic to avoid running `xmake config` unnecessarily which would invalidate the existing build and do lots of unnecessary work since dependencies were invalidated by the updated config
* also invokes build only for the chosen test targets

As a bonus, also adds `xmake sln --open` which allows opening IDE after generation of solution/xmake project is done.

32 files changed, 156 insertions, 19 deletions

diff --git a/src/zencore/base64.cpp b/src/zencore/base64.cpp
index fdf5f2d66..96e121799 100644
--- a/src/zencore/base64.cpp
+++ b/src/zencore/base64.cpp
@@ -180,6 +180,8 @@ template bool Base64::Decode<wchar_t>(const wchar_t* Source, uint32_t Length, ui
 
 using namespace std::string_literals;
 
+TEST_SUITE_BEGIN("core.base64");
+
 TEST_CASE("Base64")
 {
 	auto EncodeString = [](std::string_view Input) -> std::string {
@@ -290,6 +292,8 @@ TEST_CASE("Base64")
 	}
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/basicfile.cpp b/src/zencore/basicfile.cpp
index bd4d119fb..9dcf7663a 100644
--- a/src/zencore/basicfile.cpp
+++ b/src/zencore/basicfile.cpp
@@ -888,6 +888,8 @@ WriteToTempFile(CompositeBuffer&& Buffer, const std::filesystem::path& Path)
 
 #if ZEN_WITH_TESTS
 
+TEST_SUITE_BEGIN("core.basicfile");
+
 TEST_CASE("BasicFile")
 {
 	ScopedCurrentDirectoryChange _;
@@ -1081,6 +1083,8 @@ TEST_CASE("BasicFileBuffer")
 	}
 }
 
+TEST_SUITE_END();
+
 void
 basicfile_forcelink()
 {
diff --git a/src/zencore/blake3.cpp b/src/zencore/blake3.cpp
index 054f0d3a0..123918de5 100644
--- a/src/zencore/blake3.cpp
+++ b/src/zencore/blake3.cpp
@@ -200,6 +200,8 @@ BLAKE3Stream::GetHash()
 // 	return text;
 // }
 
+TEST_SUITE_BEGIN("core.blake3");
+
 TEST_CASE("BLAKE3")
 {
 	SUBCASE("Basics")
@@ -237,6 +239,8 @@ TEST_CASE("BLAKE3")
 	}
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/callstack.cpp b/src/zencore/callstack.cpp
index 8aa1111bf..ee0b0625a 100644
--- a/src/zencore/callstack.cpp
+++ b/src/zencore/callstack.cpp
@@ -260,6 +260,8 @@ GetCallstackRaw(void* CaptureBuffer, int FramesToSkip, int FramesToCapture)
 
 #if ZEN_WITH_TESTS
 
+TEST_SUITE_BEGIN("core.callstack");
+
 TEST_CASE("Callstack.Basic")
 {
 	void*	 Addresses[4];
@@ -272,6 +274,8 @@ TEST_CASE("Callstack.Basic")
 	}
 }
 
+TEST_SUITE_END();
+
 void
 callstack_forcelink()
 {
diff --git a/src/zencore/compactbinary.cpp b/src/zencore/compactbinary.cpp
index b43cc18f1..9c81305d0 100644
--- a/src/zencore/compactbinary.cpp
+++ b/src/zencore/compactbinary.cpp
@@ -1512,6 +1512,8 @@ uson_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.compactbinary");
+
 TEST_CASE("guid")
 {
 	using namespace std::literals;
@@ -1704,8 +1706,6 @@ TEST_CASE("uson.datetime")
 
 //////////////////////////////////////////////////////////////////////////
 
-TEST_SUITE_BEGIN("core.datetime");
-
 TEST_CASE("core.datetime.compare")
 {
 	DateTime T1(2000, 12, 13);
@@ -1732,10 +1732,6 @@ TEST_CASE("core.datetime.add")
 	CHECK(dT + T1 - T2 == dT1);
 }
 
-TEST_SUITE_END();
-
-TEST_SUITE_BEGIN("core.timespan");
-
 TEST_CASE("core.timespan.compare")
 {
 	TimeSpan T1(1000);
diff --git a/src/zencore/compactbinarybuilder.cpp b/src/zencore/compactbinarybuilder.cpp
index 63c0b9c5c..a9ba30750 100644
--- a/src/zencore/compactbinarybuilder.cpp
+++ b/src/zencore/compactbinarybuilder.cpp
@@ -710,6 +710,8 @@ usonbuilder_forcelink()
 // 	return "";
 // }
 
+TEST_SUITE_BEGIN("core.compactbinarybuilder");
+
 TEST_CASE("usonbuilder.object")
 {
 	using namespace std::literals;
@@ -1530,6 +1532,8 @@ TEST_CASE("usonbuilder.stream")
 		CHECK(ValidateCompactBinary(Object.GetBuffer(), CbValidateMode::All) == CbValidateError::None);
 	}
 }
+
+TEST_SUITE_END();
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/compactbinaryjson.cpp b/src/zencore/compactbinaryjson.cpp
index abbec360a..da560a449 100644
--- a/src/zencore/compactbinaryjson.cpp
+++ b/src/zencore/compactbinaryjson.cpp
@@ -654,6 +654,8 @@ cbjson_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.compactbinaryjson");
+
 TEST_CASE("uson.json")
 {
 	using namespace std::literals;
@@ -872,6 +874,8 @@ TEST_CASE("json.uson")
 	}
 }
 
+TEST_SUITE_END();
+
 #endif	// ZEN_WITH_TESTS
 
 }  // namespace zen
diff --git a/src/zencore/compactbinarypackage.cpp b/src/zencore/compactbinarypackage.cpp
index ffe64f2e9..56a292ca6 100644
--- a/src/zencore/compactbinarypackage.cpp
+++ b/src/zencore/compactbinarypackage.cpp
@@ -805,6 +805,8 @@ usonpackage_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.compactbinarypackage");
+
 TEST_CASE("usonpackage")
 {
 	using namespace std::literals;
@@ -1343,6 +1345,8 @@ TEST_CASE("usonpackage.invalidpackage")
 	}
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/compactbinaryvalidation.cpp b/src/zencore/compactbinaryvalidation.cpp
index d7292f405..3e78f8ef1 100644
--- a/src/zencore/compactbinaryvalidation.cpp
+++ b/src/zencore/compactbinaryvalidation.cpp
@@ -753,10 +753,14 @@ usonvalidation_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.compactbinaryvalidation");
+
 TEST_CASE("usonvalidation")
 {
 	SUBCASE("Basic") {}
 }
+
+TEST_SUITE_END();
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/compactbinaryyaml.cpp b/src/zencore/compactbinaryyaml.cpp
index b308af418..b7f2c55df 100644
--- a/src/zencore/compactbinaryyaml.cpp
+++ b/src/zencore/compactbinaryyaml.cpp
@@ -412,6 +412,8 @@ cbyaml_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.compactbinaryyaml");
+
 TEST_CASE("uson.yaml")
 {
 	using namespace std::literals;
@@ -524,6 +526,8 @@ mixed_seq:
 )"sv);
 	}
 }
+
+TEST_SUITE_END();
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/compositebuffer.cpp b/src/zencore/compositebuffer.cpp
index 252ac9045..ed2b16384 100644
--- a/src/zencore/compositebuffer.cpp
+++ b/src/zencore/compositebuffer.cpp
@@ -297,6 +297,9 @@ CompositeBuffer::IterateRange(uint64_t															  Offset,
 }
 
 #if ZEN_WITH_TESTS
+
+TEST_SUITE_BEGIN("core.compositebuffer");
+
 TEST_CASE("CompositeBuffer Null")
 {
 	CompositeBuffer Buffer;
@@ -462,6 +465,8 @@ TEST_CASE("CompositeBuffer Composite")
 	TestIterateRange(8, 0, MakeMemoryView(FlatArray).Mid(8, 0), FlatView2);
 }
 
+TEST_SUITE_END();
+
 void
 compositebuffer_forcelink()
 {
diff --git a/src/zencore/compress.cpp b/src/zencore/compress.cpp
index 25ed0fc46..6aa0adce0 100644
--- a/src/zencore/compress.cpp
+++ b/src/zencore/compress.cpp
@@ -2420,6 +2420,8 @@ private:
 
 #if ZEN_WITH_TESTS
 
+TEST_SUITE_BEGIN("core.compress");
+
 TEST_CASE("CompressedBuffer")
 {
 	uint8_t Zeroes[1024]{};
@@ -2967,6 +2969,8 @@ TEST_CASE("CompressedBufferReader")
 	}
 }
 
+TEST_SUITE_END();
+
 void
 compress_forcelink()
 {
diff --git a/src/zencore/crypto.cpp b/src/zencore/crypto.cpp
index 09eebb6ae..049854b42 100644
--- a/src/zencore/crypto.cpp
+++ b/src/zencore/crypto.cpp
@@ -449,6 +449,8 @@ crypto_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.crypto");
+
 TEST_CASE("crypto.bits")
 {
 	using CryptoBits256Bit = CryptoBits<256>;
@@ -500,6 +502,8 @@ TEST_CASE("crypto.aes")
 	}
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/filesystem.cpp b/src/zencore/filesystem.cpp
index 03398860b..9885b2ada 100644
--- a/src/zencore/filesystem.cpp
+++ b/src/zencore/filesystem.cpp
@@ -3309,6 +3309,8 @@ filesystem_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.filesystem");
+
 TEST_CASE("filesystem")
 {
 	using namespace std::filesystem;
@@ -3603,6 +3605,8 @@ TEST_CASE("SharedMemory")
 	CHECK(!OpenSharedMemory("SharedMemoryTest0", 482, false));
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/include/zencore/testing.h b/src/zencore/include/zencore/testing.h
index 43bdbbffe..8410216c4 100644
--- a/src/zencore/include/zencore/testing.h
+++ b/src/zencore/include/zencore/testing.h
@@ -43,8 +43,9 @@ public:
 	TestRunner();
 	~TestRunner();
 
-	int ApplyCommandLine(int argc, char const* const* argv);
-	int Run();
+	void SetDefaultSuiteFilter(const char* Pattern);
+	int	 ApplyCommandLine(int Argc, char const* const* Argv);
+	int	 Run();
 
 private:
 	struct Impl;
@@ -59,7 +60,7 @@ private:
 			return Runner.Run();                 \
 		}()
 
-int RunTestMain(int argc, char* argv[], const char* traceName, void (*forceLink)());
+int RunTestMain(int Argc, char* Argv[], const char* ExecutableName, void (*ForceLink)());
 
 }  // namespace zen::testing
 #endif
diff --git a/src/zencore/intmath.cpp b/src/zencore/intmath.cpp
index 32f82b486..fedf76edc 100644
--- a/src/zencore/intmath.cpp
+++ b/src/zencore/intmath.cpp
@@ -19,6 +19,8 @@ intmath_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.intmath");
+
 TEST_CASE("intmath")
 {
 	CHECK(FloorLog2(0x00) == 0);
@@ -66,6 +68,8 @@ TEST_CASE("intmath")
 	CHECK(ByteSwap(uint64_t(0x214d'6172'7469'6e21ull)) == 0x216e'6974'7261'4d21ull);
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/iobuffer.cpp b/src/zencore/iobuffer.cpp
index 1c31d6620..c47c54981 100644
--- a/src/zencore/iobuffer.cpp
+++ b/src/zencore/iobuffer.cpp
@@ -719,6 +719,8 @@ iobuffer_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.iobuffer");
+
 TEST_CASE("IoBuffer")
 {
 	zen::IoBuffer buffer1;
@@ -756,6 +758,8 @@ TEST_CASE("IoBuffer.mmap")
 #	endif
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/jobqueue.cpp b/src/zencore/jobqueue.cpp
index 75c1be42b..35724b07a 100644
--- a/src/zencore/jobqueue.cpp
+++ b/src/zencore/jobqueue.cpp
@@ -460,6 +460,8 @@ jobqueue_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.jobqueue");
+
 TEST_CASE("JobQueue")
 {
 	std::unique_ptr<JobQueue> Queue(MakeJobQueue(2, "queue"));
@@ -580,6 +582,8 @@ TEST_CASE("JobQueue")
 	}
 	JobsLatch.Wait();
 }
+
+TEST_SUITE_END();
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/logging.cpp b/src/zencore/logging.cpp
index e79c4b41c..e960a2729 100644
--- a/src/zencore/logging.cpp
+++ b/src/zencore/logging.cpp
@@ -540,6 +540,8 @@ logging_forcelink()
 
 using namespace std::literals;
 
+TEST_SUITE_BEGIN("core.logging");
+
 TEST_CASE("simple.bread")
 {
 	ExtendableStringBuilder<256> Crumbs;
@@ -588,6 +590,8 @@ TEST_CASE("simple.bread")
 	}
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/md5.cpp b/src/zencore/md5.cpp
index 4ec145697..3baee91c2 100644
--- a/src/zencore/md5.cpp
+++ b/src/zencore/md5.cpp
@@ -437,6 +437,8 @@ md5_forcelink()
 // 	return md5text;
 // }
 
+TEST_SUITE_BEGIN("core.md5");
+
 TEST_CASE("MD5")
 {
 	using namespace std::literals;
@@ -458,6 +460,8 @@ TEST_CASE("MD5")
 	CHECK(Output.compare(Buffer));
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/memoryview.cpp b/src/zencore/memoryview.cpp
index 1f6a6996c..1654b1766 100644
--- a/src/zencore/memoryview.cpp
+++ b/src/zencore/memoryview.cpp
@@ -18,6 +18,8 @@ namespace zen {
 
 #if ZEN_WITH_TESTS
 
+TEST_SUITE_BEGIN("core.memoryview");
+
 TEST_CASE("MemoryView")
 {
 	{
@@ -35,6 +37,8 @@ TEST_CASE("MemoryView")
 	CHECK(MakeMemoryView<float>({1.0f, 1.2f}).GetSize() == 8);
 }
 
+TEST_SUITE_END();
+
 void
 memory_forcelink()
 {
diff --git a/src/zencore/mpscqueue.cpp b/src/zencore/mpscqueue.cpp
index 29c76c3ca..f749f1c90 100644
--- a/src/zencore/mpscqueue.cpp
+++ b/src/zencore/mpscqueue.cpp
@@ -8,6 +8,7 @@
 namespace zen {
 
 #if ZEN_WITH_TESTS && 0
+TEST_SUITE_BEGIN("core.mpscqueue");
 TEST_CASE("mpsc")
 {
 	MpscQueue<std::string> Queue;
@@ -15,6 +16,7 @@ TEST_CASE("mpsc")
 	std::optional<std::string> Value = Queue.Dequeue();
 	CHECK_EQ(Value, "hello");
 }
+TEST_SUITE_END();
 #endif
 
 void
diff --git a/src/zencore/parallelwork.cpp b/src/zencore/parallelwork.cpp
index d86d5815f..94696f479 100644
--- a/src/zencore/parallelwork.cpp
+++ b/src/zencore/parallelwork.cpp
@@ -157,6 +157,8 @@ ParallelWork::RethrowErrors()
 
 #if ZEN_WITH_TESTS
 
+TEST_SUITE_BEGIN("core.parallelwork");
+
 TEST_CASE("parallellwork.nowork")
 {
 	std::atomic<bool> AbortFlag;
@@ -255,6 +257,8 @@ TEST_CASE("parallellwork.limitqueue")
 	Work.Wait();
 }
 
+TEST_SUITE_END();
+
 void
 parallellwork_forcelink()
 {
diff --git a/src/zencore/refcount.cpp b/src/zencore/refcount.cpp
index a6a86ee12..f19afe715 100644
--- a/src/zencore/refcount.cpp
+++ b/src/zencore/refcount.cpp
@@ -33,6 +33,8 @@ refcount_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.refcount");
+
 TEST_CASE("RefPtr")
 {
 	RefPtr<TestRefClass> Ref;
@@ -60,6 +62,8 @@ TEST_CASE("RefPtr")
 	CHECK(IsDestroyed == true);
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/sha1.cpp b/src/zencore/sha1.cpp
index 3ee74d7d8..807ae4c30 100644
--- a/src/zencore/sha1.cpp
+++ b/src/zencore/sha1.cpp
@@ -373,6 +373,8 @@ sha1_forcelink()
 // 	return sha1text;
 // }
 
+TEST_SUITE_BEGIN("core.sha1");
+
 TEST_CASE("SHA1")
 {
 	uint8_t sha1_empty[20] = {0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, 0x32, 0x55,
@@ -438,6 +440,8 @@ TEST_CASE("SHA1")
 	}
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/sharedbuffer.cpp b/src/zencore/sharedbuffer.cpp
index 78efb9d42..8dc6d49d8 100644
--- a/src/zencore/sharedbuffer.cpp
+++ b/src/zencore/sharedbuffer.cpp
@@ -152,10 +152,14 @@ sharedbuffer_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.sharedbuffer");
+
 TEST_CASE("SharedBuffer")
 {
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/stream.cpp b/src/zencore/stream.cpp
index a800ce121..de67303a4 100644
--- a/src/zencore/stream.cpp
+++ b/src/zencore/stream.cpp
@@ -79,6 +79,8 @@ BufferReader::Serialize(void* V, int64_t Length)
 
 #if ZEN_WITH_TESTS
 
+TEST_SUITE_BEGIN("core.stream");
+
 TEST_CASE("binary.writer.span")
 {
 	BinaryWriter	 Writer;
@@ -91,6 +93,8 @@ TEST_CASE("binary.writer.span")
 	CHECK(memcmp(Result.GetData(), "apa banan", 9) == 0);
 }
 
+TEST_SUITE_END();
+
 void
 stream_forcelink()
 {
diff --git a/src/zencore/string.cpp b/src/zencore/string.cpp
index ab1c7de58..27635a86c 100644
--- a/src/zencore/string.cpp
+++ b/src/zencore/string.cpp
@@ -546,6 +546,8 @@ UrlDecode(std::string_view InUrl)
 
 #if ZEN_WITH_TESTS
 
+TEST_SUITE_BEGIN("core.string");
+
 TEST_CASE("url")
 {
 	using namespace std::literals;
@@ -1222,6 +1224,8 @@ TEST_CASE("string")
 	}
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/testing.cpp b/src/zencore/testing.cpp
index 6000bd95c..0bae139bd 100644
--- a/src/zencore/testing.cpp
+++ b/src/zencore/testing.cpp
@@ -128,18 +128,24 @@ TestRunner::~TestRunner()
 {
 }
 
+void
+TestRunner::SetDefaultSuiteFilter(const char* Pattern)
+{
+	m_Impl->Session.setOption("test-suite", Pattern);
+}
+
 int
-TestRunner::ApplyCommandLine(int argc, char const* const* argv)
+TestRunner::ApplyCommandLine(int Argc, char const* const* Argv)
 {
-	m_Impl->Session.applyCommandLine(argc, argv);
+	m_Impl->Session.applyCommandLine(Argc, Argv);
 
-	for (int i = 1; i < argc; ++i)
+	for (int i = 1; i < Argc; ++i)
 	{
-		if (argv[i] == "--debug"sv)
+		if (Argv[i] == "--debug"sv)
 		{
 			zen::logging::SetLogLevel(zen::logging::level::Debug);
 		}
-		else if (argv[i] == "--verbose"sv)
+		else if (Argv[i] == "--verbose"sv)
 		{
 			zen::logging::SetLogLevel(zen::logging::level::Trace);
 		}
@@ -155,20 +161,20 @@ TestRunner::Run()
 }
 
 int
-RunTestMain(int argc, char* argv[], [[maybe_unused]] const char* traceName, void (*forceLink)())
+RunTestMain(int Argc, char* Argv[], const char* ExecutableName, void (*ForceLink)())
 {
 #	if ZEN_PLATFORM_WINDOWS
 	setlocale(LC_ALL, "en_us.UTF8");
 #	endif
 
-	forceLink();
+	ForceLink();
 
 #	if ZEN_PLATFORM_LINUX
 	zen::IgnoreChildSignals();
 #	endif
 
 #	if ZEN_WITH_TRACE
-	zen::TraceInit(traceName);
+	zen::TraceInit(ExecutableName);
 	zen::TraceOptions TraceCommandlineOptions;
 	if (GetTraceOptionsFromCommandline(TraceCommandlineOptions))
 	{
@@ -179,7 +185,30 @@ RunTestMain(int argc, char* argv[], [[maybe_unused]] const char* traceName, void
 	zen::logging::InitializeLogging();
 	zen::MaximizeOpenFileCount();
 
-	return ZEN_RUN_TESTS(argc, argv);
+	TestRunner Runner;
+
+	// Derive default suite filter from ExecutableName: "zencore-test" -> "core.*"
+	if (ExecutableName)
+	{
+		std::string_view Name = ExecutableName;
+		if (Name.starts_with("zen"))
+		{
+			Name.remove_prefix(3);
+		}
+		if (Name.ends_with("-test"))
+		{
+			Name.remove_suffix(5);
+		}
+		if (!Name.empty())
+		{
+			std::string Filter(Name);
+			Filter += ".*";
+			Runner.SetDefaultSuiteFilter(Filter.c_str());
+		}
+	}
+
+	Runner.ApplyCommandLine(Argc, Argv);
+	return Runner.Run();
 }
 
 }  // namespace zen::testing
diff --git a/src/zencore/uid.cpp b/src/zencore/uid.cpp
index d7636f2ad..971683721 100644
--- a/src/zencore/uid.cpp
+++ b/src/zencore/uid.cpp
@@ -156,6 +156,8 @@ Oid::FromMemory(const void* Ptr)
 
 #if ZEN_WITH_TESTS
 
+TEST_SUITE_BEGIN("core.uid");
+
 TEST_CASE("Oid")
 {
 	SUBCASE("Basic")
@@ -185,6 +187,8 @@ TEST_CASE("Oid")
 	}
 }
 
+TEST_SUITE_END();
+
 void
 uid_forcelink()
 {
diff --git a/src/zencore/workthreadpool.cpp b/src/zencore/workthreadpool.cpp
index cb84bbe06..1cb338c66 100644
--- a/src/zencore/workthreadpool.cpp
+++ b/src/zencore/workthreadpool.cpp
@@ -354,6 +354,8 @@ workthreadpool_forcelink()
 
 using namespace std::literals;
 
+TEST_SUITE_BEGIN("core.workthreadpool");
+
 TEST_CASE("threadpool.basic")
 {
 	WorkerThreadPool Threadpool{1};
@@ -368,6 +370,8 @@ TEST_CASE("threadpool.basic")
 	CHECK_THROWS(FutureThrow.get());
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/zencore.cpp b/src/zencore/zencore.cpp
index 4ff79edc7..d82474705 100644
--- a/src/zencore/zencore.cpp
+++ b/src/zencore/zencore.cpp
@@ -285,7 +285,7 @@ zencore_forcelinktests()
 
 namespace zen {
 
-TEST_SUITE_BEGIN("core.assert");
+TEST_SUITE_BEGIN("core.zencore");
 
 TEST_CASE("Assert.Default")
 {