From 31b7a9c3127560ea0c488b88e93077e08600652f Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 14 Feb 2020 12:21:16 +0100 Subject: Add expect option to logger command --- kernel/log.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'kernel/log.h') diff --git a/kernel/log.h b/kernel/log.h index 9db8efaa5..0f912fccb 100644 --- a/kernel/log.h +++ b/kernel/log.h @@ -135,6 +135,23 @@ void log_backtrace(const char *prefix, int levels); void log_reset_stack(); void log_flush(); +struct LogExpectedItem +{ + LogExpectedItem(std::string pattern, int expected) : + expected_count(expected), + current_count(0), + pattern(pattern) + { + } + + int expected_count; + int current_count; + std::string pattern; +}; + +extern std::vector> log_expect_log, log_expect_warning, log_expect_error; +void log_check_expected(); + const char *log_signal(const RTLIL::SigSpec &sig, bool autoint = true); const char *log_const(const RTLIL::Const &value, bool autoint = true); const char *log_id(RTLIL::IdString id); -- cgit v1.2.3 From 5641b0248fe0781ee62fa3bc903f8db95e80b0c4 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 17 Feb 2020 15:36:06 +0100 Subject: Option to expect no warnings --- kernel/log.h | 1 + 1 file changed, 1 insertion(+) (limited to 'kernel/log.h') diff --git a/kernel/log.h b/kernel/log.h index 0f912fccb..79de1a20a 100644 --- a/kernel/log.h +++ b/kernel/log.h @@ -52,6 +52,7 @@ extern std::map> log_hdump; extern std::vector log_warn_regexes, log_nowarn_regexes, log_werror_regexes; extern std::set log_warnings, log_experimentals, log_experimentals_ignored; extern int log_warnings_count; +extern bool log_expect_no_warnings; extern bool log_hdump_all; extern FILE *log_errfile; extern SHA1 *log_hasher; -- cgit v1.2.3 From d079ab9d19b7d18134f5b6f30da9a6666f30ad97 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 22 Feb 2020 10:52:46 +0100 Subject: Handle expect no warnings together with expected --- kernel/log.h | 1 + 1 file changed, 1 insertion(+) (limited to 'kernel/log.h') diff --git a/kernel/log.h b/kernel/log.h index 79de1a20a..603938f4c 100644 --- a/kernel/log.h +++ b/kernel/log.h @@ -52,6 +52,7 @@ extern std::map> log_hdump; extern std::vector log_warn_regexes, log_nowarn_regexes, log_werror_regexes; extern std::set log_warnings, log_experimentals, log_experimentals_ignored; extern int log_warnings_count; +extern int log_warnings_count_noexpect; extern bool log_expect_no_warnings; extern bool log_hdump_all; extern FILE *log_errfile; -- cgit v1.2.3