aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2023-05-09 15:33:29 +0200
committerStefan Boberg <[email protected]>2023-05-09 15:33:29 +0200
commit0822a8481ce37ebfdc91fec288329f7671d069f9 (patch)
treec16957fdd0d699d09b3955548dcf72adb887bf7e /src
parentimplemented thread-local activity tracking (diff)
downloadzen-0822a8481ce37ebfdc91fec288329f7671d069f9.tar.xz
zen-0822a8481ce37ebfdc91fec288329f7671d069f9.zip
make logging tests run as part of zencore-test
Diffstat (limited to 'src')
-rw-r--r--src/zencore/include/zencore/logging.h2
-rw-r--r--src/zencore/logging.cpp2
-rw-r--r--src/zencore/zencore.cpp4
3 files changed, 6 insertions, 2 deletions
diff --git a/src/zencore/include/zencore/logging.h b/src/zencore/include/zencore/logging.h
index 92db1b35b..1f5c56e89 100644
--- a/src/zencore/include/zencore/logging.h
+++ b/src/zencore/include/zencore/logging.h
@@ -216,4 +216,6 @@ std::string_view EmitScopesForLogging(StringBuilderBase& OutString);
ScopedActivityBase* GetThreadActivity();
+void logging_forcelink(); // internal
+
} // namespace zen
diff --git a/src/zencore/logging.cpp b/src/zencore/logging.cpp
index 13a8ce9ef..33e81825c 100644
--- a/src/zencore/logging.cpp
+++ b/src/zencore/logging.cpp
@@ -187,7 +187,7 @@ TEST_CASE("simple.bread")
ZEN_LOG_SCOPE("{}:{}", "abc", "def");
CHECK_EQ(EmitBreadcrumbs(), "abc:def42plantamazeworldhello"sv);
}
- CHECK_EQ(EmitBreadcrumbs(), "amazeworldhello"sv);
+ CHECK_EQ(EmitBreadcrumbs(), "plantamazeworldhello"sv);
}
}
diff --git a/src/zencore/zencore.cpp b/src/zencore/zencore.cpp
index 2a7c5755e..96d61a0ab 100644
--- a/src/zencore/zencore.cpp
+++ b/src/zencore/zencore.cpp
@@ -20,6 +20,7 @@
#include <zencore/filesystem.h>
#include <zencore/intmath.h>
#include <zencore/iobuffer.h>
+#include <zencore/logging.h>
#include <zencore/memory.h>
#include <zencore/mpscqueue.h>
#include <zencore/refcount.h>
@@ -105,9 +106,11 @@ zencore_forcelinktests()
zen::blake3_forcelink();
zen::compositebuffer_forcelink();
zen::compress_forcelink();
+ zen::crypto_forcelink();
zen::filesystem_forcelink();
zen::intmath_forcelink();
zen::iobuffer_forcelink();
+ zen::logging_forcelink();
zen::memory_forcelink();
zen::mpscqueue_forcelink();
zen::refcount_forcelink();
@@ -121,7 +124,6 @@ zencore_forcelinktests()
zen::uson_forcelink();
zen::usonbuilder_forcelink();
zen::usonpackage_forcelink();
- zen::crypto_forcelink();
}
} // namespace zen