From 645e1387e05eee9d5d673a15aa437d604344c2d5 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Thu, 2 Feb 2023 19:10:20 -0500 Subject: [PATCH] Tests: Fix merge conflict failure --- test_regress/t/t_flag_werror_bad2.out | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test_regress/t/t_flag_werror_bad2.out b/test_regress/t/t_flag_werror_bad2.out index 5e0131123..2f1001fbd 100644 --- a/test_regress/t/t_flag_werror_bad2.out +++ b/test_regress/t/t_flag_werror_bad2.out @@ -1,7 +1,6 @@ -%Warning-WIDTHTRUNC: t/t_flag_werror.v:10:19: Operator ASSIGNW expects 4 bits on the Assign RHS, but Assign RHS's CONST '6'h2e' generates 6 bits. - : ... In instance t +%Error-WIDTHTRUNC: t/t_flag_werror.v:10:19: Operator ASSIGNW expects 4 bits on the Assign RHS, but Assign RHS's CONST '6'h2e' generates 6 bits. + : ... In instance t 10 | wire [3:0] foo = 6'h2e; | ^ - ... For warning description see https://verilator.org/warn/WIDTHTRUNC?v=latest - ... Use "/* verilator lint_off WIDTHTRUNC */" and lint_on around source to disable this message. + ... For error description see https://verilator.org/warn/WIDTHTRUNC?v=latest %Error: Exiting due to