[dvsim] Fix error detection logic in Deploy.py
The code in set_status searches through the log for error messages. If
it finds one, it adds it to self.fail_msg. If it doesn't find an error
message, the code is supposed to check the process return code. If
that is nonzero, it considers the job to have failed and adds the end
of the log to the fail message.
Unfortunately the "did I see an error message" logic was wrong,
because it assumed self.fail_msg would be empty before running
set_status. This isn't true for CompileSim, at any rate, because the
constructor adds a header.
This patch corrects the logic by adding an explicit local
"seen_fail_pattern" variable.
Signed-off-by: Rupert Swarbrick <rswarbrick@lowrisc.org>
diff --git a/util/dvsim/Deploy.py b/util/dvsim/Deploy.py
index 7f958f4..b0dde6a 100644
--- a/util/dvsim/Deploy.py
+++ b/util/dvsim/Deploy.py
@@ -257,8 +257,9 @@
def set_status(self):
self.status = 'P'
if self.dry_run is False:
+ seen_fail_pattern = False
for fail_pattern in self.fail_patterns:
- # Return error messege with the following 4 lines.
+ # Return error message with the following 4 lines.
grep_cmd = "grep -m 1 -A 4 -E \'" + fail_pattern + "\' " + self.log
(status, rslt) = subprocess.getstatusoutput(grep_cmd)
if rslt:
@@ -266,12 +267,13 @@
self.fail_msg += msg
log.log(VERBOSE, msg)
self.status = 'F'
+ seen_fail_pattern = True
break
# If fail patterns were not encountered, but the job returned with non-zero exit code
# for whatever reason, then show the last 10 lines of the log as the failure message,
# which might help with the debug.
- if self.process.returncode != 0 and not self.fail_msg:
+ if self.process.returncode != 0 and not seen_fail_pattern:
msg = "Last 10 lines of the log:<br>\n"
self.fail_msg += msg
log.log(VERBOSE, msg)
