diff --git a/dv/uvm/core_ibex/collect_results.py b/dv/uvm/core_ibex/collect_results.py index 51cb50e3..3c81ac6e 100755 --- a/dv/uvm/core_ibex/collect_results.py +++ b/dv/uvm/core_ibex/collect_results.py @@ -90,9 +90,11 @@ def gen_test_run_result_text(test_run_result: TestRunResult) -> str: info_lines.append(f'Comparison log: {test_run_result.comparison_log}') if (test_run_result.passed): + info_lines.append('') info_lines.append('[PASSED]') else: - info_lines.append(f'{test_run_result.failure_message}') + info_lines.append('') + info_lines.append(test_run_result.failure_message) return '\n'.join(info_lines) + '\n' @@ -148,7 +150,7 @@ def output_run_results_junit_xml(passing_tests: List[TestRunResult], test_case = junit_xml.TestCase(f'{trr.name}.{trr.seed}') test_case.stdout = result_text - merged['stdout'] += result_text + merged['stdout'] += result_text + '\n' if not trr.passed: test_case.add_failure_info(output=result_text) diff --git a/dv/uvm/core_ibex/riscv_dv_extension/ibex_log_to_trace_csv.py b/dv/uvm/core_ibex/riscv_dv_extension/ibex_log_to_trace_csv.py index 3a64292e..d5e20126 100644 --- a/dv/uvm/core_ibex/riscv_dv_extension/ibex_log_to_trace_csv.py +++ b/dv/uvm/core_ibex/riscv_dv_extension/ibex_log_to_trace_csv.py @@ -207,7 +207,7 @@ def check_ibex_uvm_log(uvm_log): for line in log: if ('UVM_ERROR' in line or 'UVM_FATAL' in line or 'Error' in line) \ and not test_result_seen: - log_out.append(line) + log_out.append(line.strip()) failed = True if 'RISC-V UVM TEST PASSED' in line: