From 5be80046a9d662cd3bb49cd9f394ddd4f9b649bd Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 27 Dec 2023 09:23:58 -0800 Subject: [PATCH] Fix run_ivl.py Commit 56c5bf1da1d4 ("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 --- ivtest/run_ivl.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/ivtest/run_ivl.py b/ivtest/run_ivl.py index 34829ffd6..8753a6340 100644 --- a/ivtest/run_ivl.py +++ b/ivtest/run_ivl.py @@ -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: