riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove duplicate warning detection

This commit is contained in:
Miodrag Milanovic 2020-02-23 10:56:27 +01:00
parent 48eed2860c
commit 1c569fe06a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/log.cc
View File

@ -668,9 +668,11 @@ void log_check_expected()
for (auto &item : log_expect_warning) { for (auto &item : log_expect_warning) {
if (item.second.current_count == 0) { if (item.second.current_count == 0) {
log_warn_regexes.clear();
log_error("Expected warning pattern '%s' not found !\n", item.second.pattern.c_str()); log_error("Expected warning pattern '%s' not found !\n", item.second.pattern.c_str());
} }
if (item.second.current_count != item.second.expected_count) { if (item.second.current_count != item.second.expected_count) {
log_warn_regexes.clear();
log_error("Expected warning pattern '%s' found %d time(s), instead of %d time(s) !\n", log_error("Expected warning pattern '%s' found %d time(s), instead of %d time(s) !\n",
item.second.pattern.c_str(), item.second.current_count, item.second.expected_count); item.second.pattern.c_str(), item.second.current_count, item.second.expected_count);
} }
@ -678,9 +680,11 @@ void log_check_expected()
for (auto &item : log_expect_log) { for (auto &item : log_expect_log) {
if (item.second.current_count == 0) { if (item.second.current_count == 0) {
log_warn_regexes.clear();
log_error("Expected log pattern '%s' not found !\n", item.second.pattern.c_str()); log_error("Expected log pattern '%s' not found !\n", item.second.pattern.c_str());
} }
if (item.second.current_count != item.second.expected_count) { if (item.second.current_count != item.second.expected_count) {
log_warn_regexes.clear();
log_error("Expected log pattern '%s' found %d time(s), instead of %d time(s) !\n", log_error("Expected log pattern '%s' found %d time(s), instead of %d time(s) !\n",
item.second.pattern.c_str(), item.second.current_count, item.second.expected_count); item.second.pattern.c_str(), item.second.current_count, item.second.expected_count);
} }
@ -688,6 +692,7 @@ void log_check_expected()
for (auto &item : log_expect_error) for (auto &item : log_expect_error)
if (item.second.current_count == item.second.expected_count) { if (item.second.current_count == item.second.expected_count) {
log_warn_regexes.clear();
log("Expected error pattern '%s' found !!!\n", item.second.pattern.c_str()); log("Expected error pattern '%s' found !!!\n", item.second.pattern.c_str());
#ifdef EMSCRIPTEN #ifdef EMSCRIPTEN
log_files = backup_log_files; log_files = backup_log_files;
@ -699,6 +704,7 @@ void log_check_expected()
#endif #endif
} else { } else {
display_error_log_msg = false; display_error_log_msg = false;
log_warn_regexes.clear();
log_error("Expected error pattern '%s' not found !\n", item.second.pattern.c_str()); log_error("Expected error pattern '%s' not found !\n", item.second.pattern.c_str());
} }
} }