github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-01 04:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Cleaner error summaries

Browse Source
This commit is contained in:
Wilson Snyder 2024-12-01 10:27:05 -05:00
parent 611567c385
commit 9ec5413d33
1 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
test_regress/driver.py
View File

@ -449,7 +449,7 @@ class Runner:
else: else:
error_msg = test.errors if test.errors else test.errors_keep_going error_msg = test.errors if test.errors else test.errors_keep_going
test.oprint("FAILED: " + error_msg) test.oprint("FAILED: " + error_msg)
makecmd = VtOs.getenv_def('VERILATOR_MAKE', os.environ['MAKE']) + " &&" makecmd = VtOs.getenv_def('VERILATOR_MAKE', os.environ['MAKE'] + "&&")
upperdir = 'test_regress/' if re.search(r'test_regress', os.getcwd()) else '' upperdir = 'test_regress/' if re.search(r'test_regress', os.getcwd()) else ''
self.fail_msgs.append("\t#" + test.soprint("%Error: " + error_msg) + "\t\t" + makecmd + self.fail_msgs.append("\t#" + test.soprint("%Error: " + error_msg) + "\t\t" + makecmd +
" " + upperdir + test.py_filename + ' ' + " " + upperdir + test.py_filename + ' ' +
@ -603,6 +603,7 @@ class VlTest:
self.running_id = running_id self.running_id = running_id
self.scenario = scenario self.scenario = scenario
self._force_pass = False
self._have_solver_called = False self._have_solver_called = False
self._inputs = {} self._inputs = {}
self._ok = False self._ok = False
@ -814,6 +815,8 @@ class VlTest:
"""Called from tests as: error("Reason message") """Called from tests as: error("Reason message")
Newline is optional. Only first line is passed to summaries Newline is optional. Only first line is passed to summaries
Throws a VtErrorException, so rest of testing is not executed""" Throws a VtErrorException, so rest of testing is not executed"""
if self._force_pass:
return
message = message.rstrip() + "\n" message = message.rstrip() + "\n"
print("%Warning: " + self.scenario + "/" + self.name + ": " + message, print("%Warning: " + self.scenario + "/" + self.name + ": " + message,
file=sys.stderr, file=sys.stderr,
@ -826,7 +829,7 @@ class VlTest:
def error_keep_going(self, message: str) -> None: def error_keep_going(self, message: str) -> None:
"""Called from tests as: error_keep_going("Reason message") """Called from tests as: error_keep_going("Reason message")
Newline is optional. Only first line is passed to summaries""" Newline is optional. Only first line is passed to summaries"""
if self._quit: if self._quit or self._force_pass:
return return
message = message.rstrip() + "\n" message = message.rstrip() + "\n"
print("%Warning: " + self.scenario + "/" + self.name + ": " + message, print("%Warning: " + self.scenario + "/" + self.name + ": " + message,
@ -1710,6 +1713,9 @@ class VlTest:
got = proc.stdout.readinto(rawbuf) got = proc.stdout.readinto(rawbuf)
if got: if got:
data = rawbuf[0:got] data = rawbuf[0:got]
if re.search(r'--debug-exit-uvm23: Exiting', str(data)):
self._force_pass = True
print("EXIT: " + str(data))
if tee: if tee:
sys.stdout.write(data.decode('latin-1')) sys.stdout.write(data.decode('latin-1'))
if Args.interactive_debugger: if Args.interactive_debugger:
@ -1741,20 +1747,12 @@ class VlTest:
print("driver: Leaving directory '" + os.path.abspath(entering) + "'") print("driver: Leaving directory '" + os.path.abspath(entering) + "'")
if not fails and status: if not fails and status:
firstline = "" firstline = self._error_log_summary(logfile)
if logfile: self.error("Exec of " + self._error_cmd_simplify(cmd) + " failed: " + firstline)
with open(logfile, 'r', encoding="utf8") as fh:
for line in fh:
line = line.rstrip()
if re.match(r'^- ', line): # Debug message
continue
firstline = line
break
self.error("Exec of " + cmd[0] + " failed: " + firstline)
if fails and status: if fails and status:
print("(Exec expected to fail, and did.)") print("(Exec expected to fail, and did.)")
if fails and not status: if fails and not status:
self.error("Exec of " + cmd[0] + " ok, but expected to fail") self.error("Exec of " + self._error_cmd_simplify(cmd) + " ok, but expected to fail")
if self.errors or self._skips: if self.errors or self._skips:
return False return False
@ -1793,17 +1791,34 @@ class VlTest:
# Little utilities # Little utilities
@staticmethod @staticmethod
def _try_regex(text: str, regex) -> None: def _error_cmd_simplify(cmd: list) -> str:
# Try to eval a regexp if cmd[0] == "perl" and re.search(r'/bin/verilator', cmd[1]):
# Returns: return "verilator"
# 1 if $text ~= /$regex/ms return cmd[0]
# 0 if no match
# -1 if $regex is invalid, doesn't compile def _error_log_summary(self, filename: str) -> str:
try: size = ""
m = re.search(regex, text) if False: # Show test size for fault grading # pylint: disable=using-constant-test
return 1 if m else 0 if self.top_filename and os.path.exists(self.top_filename):
except re.error: size = "(Test " + str(os.stat(self.top_filename).st_size) + " B) "
return -1 if not filename:
return size
firstline = ""
with open(filename, 'r', encoding="utf8") as fh:
lineno = 0
for line in fh:
lineno += 1
if lineno > 100:
break
line = line.rstrip()
if re.match(r'^- ', line): # Debug message
continue
if not firstline:
firstline = line
if (re.search(r'error|warn', line, re.IGNORECASE)
and not re.search(r'-Werror', line)):
return size + line
return size + firstline
def _make_main(self, timing_loop: bool) -> None: def _make_main(self, timing_loop: bool) -> None:
if timing_loop and self.sc: if timing_loop and self.sc: