mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-23 09:05:32 +00:00
Code Activity

logger: fix unmatched expected warnings and errors

Browse source 
- Prevent unmatched expected error patterns from self-matching
- Prevent infinite recursion on unmatched expected warnings
- Always print the error message for unmatched error patterns
- Add test coverage for all unmatched message types
- Add test coverage for excess matched logs and warnings
This commit is contained in:
Zachary Snow 2022-01-03 20:12:22 -07:00 • committed by Zachary Snow
parent b022fe61a7
commit 66447e8faf
2 changed files with 53 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
kernel/log.cc
View file

@ -71,7 +71,6 @@ int string_buf_index = -1;
static struct timeval initial_tv = { 0, 0 };
static bool next_print_log = false;
static int log_newline_count = 0;
static bool display_error_log_msg = true;
static void log_id_cache_clear()
{
@ -338,8 +337,7 @@ static void logv_error_with_prefix(const char *prefix,
f = stderr;
log_last_error = vstringf(format, ap);
if (display_error_log_msg)
log("%s%s", prefix, log_last_error.c_str());
log("%s%s", prefix, log_last_error.c_str());
log_flush();
log_make_debug = bak_log_make_debug;
@ -665,7 +663,14 @@ void log_wire(RTLIL::Wire *wire, std::string indent)
void log_check_expected()
{
for (auto &item : log_expect_warning) {
// copy out all of the expected logs so that they cannot be re-checked
// or match against themselves
dict<std::string, LogExpectedItem> expect_log, expect_warning, expect_error;
std::swap(expect_warning, log_expect_warning);
std::swap(expect_log, log_expect_log);
std::swap(expect_error, log_expect_error);
for (auto &item : expect_warning) {
if (item.second.current_count == 0) {
log_warn_regexes.clear();
log_error("Expected warning pattern '%s' not found !\n", item.first.c_str());
@ -677,7 +682,7 @@ void log_check_expected()
}
}
for (auto &item : log_expect_log) {
for (auto &item : expect_log) {
if (item.second.current_count == 0) {
log_warn_regexes.clear();
log_error("Expected log pattern '%s' not found !\n", item.first.c_str());
@ -689,7 +694,7 @@ void log_check_expected()
}
}
for (auto &item : log_expect_error)
for (auto &item : expect_error)
if (item.second.current_count == item.second.expected_count) {
log_warn_regexes.clear();
log("Expected error pattern '%s' found !!!\n", item.first.c_str());
@ -701,14 +706,9 @@ void log_check_expected()
_Exit(0);
#endif
} else {
display_error_log_msg = false;
log_warn_regexes.clear();
log_error("Expected error pattern '%s' not found !\n", item.first.c_str());
}
log_expect_warning.clear();
log_expect_log.clear();
log_expect_error.clear();
}
// ---------------------------------------------------