From 9e15bae76c847605090ede9f5d5a7426efab2b07 Mon Sep 17 00:00:00 2001 From: Tommy Date: Mon, 18 Jul 2022 17:45:48 +1200 Subject: [PATCH] Fix broken unit test This log definition really shouldn't work. It seems to rely on log timestamps being globally disabled during tests. However that's what it was set up to do, so i am not changing it more than necessary. --- src/gui/core/log.hpp | 2 +- src/log.hpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/core/log.hpp b/src/gui/core/log.hpp index 9b926786a5e..ba29e73b46c 100644 --- a/src/gui/core/log.hpp +++ b/src/gui/core/log.hpp @@ -45,7 +45,7 @@ extern lg::log_domain log_gui_general; extern lg::log_domain log_gui_iterator; -#define TST_GUI_I LOG_STREAM_NAMELESS(debug, gui2::log_gui_iterator) +#define TST_GUI_I LOG_STREAM_NAMELESS_STREAMING(debug, gui2::log_gui_iterator) #define DBG_GUI_I LOG_STREAM_INDENT(debug, gui2::log_gui_iterator) #define LOG_GUI_I LOG_STREAM_INDENT(info, gui2::log_gui_iterator) #define WRN_GUI_I LOG_STREAM_INDENT(warn, gui2::log_gui_iterator) diff --git a/src/log.hpp b/src/log.hpp index 823913e440d..67bb3a902be 100644 --- a/src/log.hpp +++ b/src/log.hpp @@ -226,6 +226,9 @@ std::stringstream& log_to_chat(); // Don't prefix the logdomain to messages on this stream #define LOG_STREAM_NAMELESS(level, domain) if (lg::level().dont_log(domain)) ; else lg::level()(domain, false) | formatter() +// Like LOG_STREAM_NAMELESS except doesn't add newlines automatically +#define LOG_STREAM_NAMELESS_STREAMING(level, domain) if (lg::level().dont_log(domain)) ; else lg::level()(domain, false, false, true, true, false) | formatter() + // When using log_scope/log_scope2 it is nice to have all output indented. #define LOG_STREAM_INDENT(level,domain) if (lg::level().dont_log(domain)) ; else lg::level()(domain, true, true) | formatter()