luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix run_ivl.py 

Commit 56c5bf1da1 ("ivtest: Remove regress v11, v12, and v13") removed the
`expected_fail` argument from the `check_run_outputs()` function, but did
not remove all references. This causes the run_ivl.py script to fail. The
script is part of the CI pipeline and causes all PRs to fail.

Remove the remaining references to `expected_fail` to make it work again.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
Lars-Peter Clausen 2023-12-27 09:23:58 -08:00
parent 734f2a076b
commit 5be80046a9
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ivtest/run_ivl.py
View File

@ -188,16 +188,10 @@ def check_run_outputs(options : dict, it_stdout : str, log_list : list) -> list:
fd.readline()
diff_data2 = fd.read()
if expected_fail:
if diff_data1 == diff_data2:
return [1, "Failed - Passed, but expected failure"]
else:
return [0, "Passed"]
if diff_data1 == diff_data2:
return [0, "Passed"]
else:
if diff_data1 == diff_data2:
return [0, "Passed"]
else:
return [1, "Failed - Files {name1} and {name2} differ.".format(name1=diff_name1, name2=diff_name2)]
return [1, "Failed - Files {name1} and {name2} differ.".format(name1=diff_name1, name2=diff_name2)]
# Otherwise, look for the PASSED output string in stdout.
@ -207,10 +201,7 @@ def check_run_outputs(options : dict, it_stdout : str, log_list : list) -> list:
# If there is no PASSED output, and nothing else to check, then
# assume a failure.
if expected_fail:
return [0, "Passed"]
else:
return [1, "Failed - No PASSED output, and no gold file"]
return [1, "Failed - No PASSED output, and no gold file"]
def do_run_normal_vlog95(options : dict, expected_fail : bool) -> list: