make sure tests initialize trace so we don't end up allocating tons of memory for no reason (#397)

7 files changed, 13 insertions, 2 deletions

diff --git a/src/zencore-test/zencore-test.cpp b/src/zencore-test/zencore-test.cpp
index 40cb51156..928c4e5c2 100644
--- a/src/zencore-test/zencore-test.cpp
+++ b/src/zencore-test/zencore-test.cpp
@@ -5,6 +5,7 @@
 
 #include <zencore/filesystem.h>
 #include <zencore/logging.h>
+#include <zencore/trace.h>
 #include <zencore/zencore.h>
 
 #include <zencore/memory/newdelete.h>
@@ -20,6 +21,7 @@ main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
 #if ZEN_WITH_TESTS
 	zen::zencore_forcelinktests();
 
+	zen::TraceInit("zencore-test");
 	zen::logging::InitializeLogging();
 	zen::MaximizeOpenFileCount();
 
diff --git a/src/zenhttp-test/zenhttp-test.cpp b/src/zenhttp-test/zenhttp-test.cpp
index 49db1ba54..a1327320e 100644
--- a/src/zenhttp-test/zenhttp-test.cpp
+++ b/src/zenhttp-test/zenhttp-test.cpp
@@ -3,6 +3,7 @@
 #include <zencore/filesystem.h>
 #include <zencore/logging.h>
 #include <zencore/memory/newdelete.h>
+#include <zencore/trace.h>
 #include <zenhttp/zenhttp.h>
 
 #if ZEN_WITH_TESTS
@@ -16,6 +17,7 @@ main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
 #if ZEN_WITH_TESTS
 	zen::zenhttp_forcelinktests();
 
+	zen::TraceInit("zenhttp-test");
 	zen::logging::InitializeLogging();
 	zen::MaximizeOpenFileCount();
 
diff --git a/src/zennet-test/zennet-test.cpp b/src/zennet-test/zennet-test.cpp
index 482d3c617..bac0dec8f 100644
--- a/src/zennet-test/zennet-test.cpp
+++ b/src/zennet-test/zennet-test.cpp
@@ -2,6 +2,7 @@
 
 #include <zencore/filesystem.h>
 #include <zencore/logging.h>
+#include <zencore/trace.h>
 #include <zennet/zennet.h>
 
 #include <zencore/memory/newdelete.h>
@@ -17,6 +18,7 @@ main([[maybe_unused]] int argc, [[maybe_unused]] char** argv)
 #if ZEN_WITH_TESTS
 	zen::zennet_forcelinktests();
 
+	zen::TraceInit("zennet-test");
 	zen::logging::InitializeLogging();
 	zen::MaximizeOpenFileCount();
 
diff --git a/src/zenserver-test/zenserver-test.cpp b/src/zenserver-test/zenserver-test.cpp
index 78a735ea0..ded40a486 100644
--- a/src/zenserver-test/zenserver-test.cpp
+++ b/src/zenserver-test/zenserver-test.cpp
@@ -100,6 +100,7 @@ main(int argc, char** argv)
 	using namespace std::literals;
 	using namespace zen;
 
+	zen::TraceInit("zenserver-test");
 	zen::logging::InitializeLogging();
 
 	zen::logging::SetLogLevel(zen::logging::level::Debug);
diff --git a/src/zenstore-test/zenstore-test.cpp b/src/zenstore-test/zenstore-test.cpp
index c56971520..04f5a8e10 100644
--- a/src/zenstore-test/zenstore-test.cpp
+++ b/src/zenstore-test/zenstore-test.cpp
@@ -2,7 +2,7 @@
 
 #include <zencore/filesystem.h>
 #include <zencore/logging.h>
-#include <zenstore/buildstore/buildstore.h>
+#include <zencore/trace.h>
 #include <zenstore/zenstore.h>
 
 #include <zencore/memory/newdelete.h>
@@ -18,8 +18,8 @@ main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
 #if ZEN_WITH_TESTS
 	zen::zenstore_forcelinktests();
 
+	zen::TraceInit("zenstore-test");
 	zen::logging::InitializeLogging();
-	zen::buildstore_forcelink();
 	zen::MaximizeOpenFileCount();
 
 	return ZEN_RUN_TESTS(argc, argv);
diff --git a/src/zenstore/zenstore.cpp b/src/zenstore/zenstore.cpp
index c697647d2..654fb3510 100644
--- a/src/zenstore/zenstore.cpp
+++ b/src/zenstore/zenstore.cpp
@@ -5,6 +5,7 @@
 #if ZEN_WITH_TESTS
 
 #	include <zenstore/blockstore.h>
+#	include <zenstore/buildstore/buildstore.h>
 #	include <zenstore/cache/structuredcachestore.h>
 #	include <zenstore/workspaces.h>
 #	include <zenstore/gc.h>
@@ -19,6 +20,7 @@ namespace zen {
 void
 zenstore_forcelinktests()
 {
+	buildstore_forcelink();
 	CAS_forcelink();
 	filecas_forcelink();
 	blockstore_forcelink();
diff --git a/src/zenutil-test/zenutil-test.cpp b/src/zenutil-test/zenutil-test.cpp
index fadaf0995..ca8208314 100644
--- a/src/zenutil-test/zenutil-test.cpp
+++ b/src/zenutil-test/zenutil-test.cpp
@@ -2,6 +2,7 @@
 
 #include <zencore/filesystem.h>
 #include <zencore/logging.h>
+#include <zencore/trace.h>
 #include <zenutil/zenutil.h>
 
 #include <zencore/memory/newdelete.h>
@@ -17,6 +18,7 @@ main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
 #if ZEN_WITH_TESTS
 	zen::zenutil_forcelinktests();
 
+	zen::TraceInit("zencore-test");
 	zen::logging::InitializeLogging();
 	zen::MaximizeOpenFileCount();