Merge pull request #1054 from larsclausen/fix-run_ivl_py
Fix run_ivl.py
This commit is contained in:
commit
bc119f96a9
|
|
@ -188,16 +188,10 @@ def check_run_outputs(options : dict, it_stdout : str, log_list : list) -> list:
|
||||||
fd.readline()
|
fd.readline()
|
||||||
diff_data2 = fd.read()
|
diff_data2 = fd.read()
|
||||||
|
|
||||||
if expected_fail:
|
if diff_data1 == diff_data2:
|
||||||
if diff_data1 == diff_data2:
|
return [0, "Passed"]
|
||||||
return [1, "Failed - Passed, but expected failure"]
|
|
||||||
else:
|
|
||||||
return [0, "Passed"]
|
|
||||||
else:
|
else:
|
||||||
if diff_data1 == diff_data2:
|
return [1, "Failed - Files {name1} and {name2} differ.".format(name1=diff_name1, name2=diff_name2)]
|
||||||
return [0, "Passed"]
|
|
||||||
else:
|
|
||||||
return [1, "Failed - Files {name1} and {name2} differ.".format(name1=diff_name1, name2=diff_name2)]
|
|
||||||
|
|
||||||
|
|
||||||
# Otherwise, look for the PASSED output string in stdout.
|
# 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
|
# If there is no PASSED output, and nothing else to check, then
|
||||||
# assume a failure.
|
# assume a failure.
|
||||||
if expected_fail:
|
return [1, "Failed - No PASSED output, and no gold file"]
|
||||||
return [0, "Passed"]
|
|
||||||
else:
|
|
||||||
return [1, "Failed - No PASSED output, and no gold file"]
|
|
||||||
|
|
||||||
|
|
||||||
def do_run_normal_vlog95(options : dict, expected_fail : bool) -> list:
|
def do_run_normal_vlog95(options : dict, expected_fail : bool) -> list:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue