diff --git a/test_regress/t/t_class_scope_import.out b/test_regress/t/t_class_scope_import_bad.out similarity index 63% rename from test_regress/t/t_class_scope_import.out rename to test_regress/t/t_class_scope_import_bad.out index 0429ee0bc..d9fe115e4 100644 --- a/test_regress/t/t_class_scope_import.out +++ b/test_regress/t/t_class_scope_import_bad.out @@ -1,4 +1,4 @@ -%Error: t/t_class_scope_import.v:11:14: Import statement directly within a class scope is illegal +%Error: t/t_class_scope_import_bad.v:11:14: Import statement directly within a class scope is illegal 11 | import pkg::*; | ^~ ... See the manual at https://verilator.org/verilator_doc.html?v=latest for more assistance. diff --git a/test_regress/t/t_class_scope_import.py b/test_regress/t/t_class_scope_import_bad.py similarity index 100% rename from test_regress/t/t_class_scope_import.py rename to test_regress/t/t_class_scope_import_bad.py diff --git a/test_regress/t/t_class_scope_import.v b/test_regress/t/t_class_scope_import_bad.v similarity index 100% rename from test_regress/t/t_class_scope_import.v rename to test_regress/t/t_class_scope_import_bad.v diff --git a/test_regress/t/t_lint_implicit_type_bad.out b/test_regress/t/t_lint_implicit_type_bad.out index 64d7659f0..80984654a 100644 --- a/test_regress/t/t_lint_implicit_type_bad.out +++ b/test_regress/t/t_lint_implicit_type_bad.out @@ -1,5 +1,5 @@ -%Error: t/t_lint_implicit_type_bad.v:11:11: syntax error, unexpected IDENTIFIER-for-type - 11 | assign imp_type_conflict = 1'b1; - | ^~~~~~~~~~~~~~~~~ +%Error: t/t_lint_implicit_type_bad.v:15:11: syntax error, unexpected IDENTIFIER-for-type + 15 | assign imp_typedef_conflict = 1'b1; + | ^~~~~~~~~~~~~~~~~~~~ ... See the manual at https://verilator.org/verilator_doc.html?v=latest for more assistance. %Error: Exiting due to diff --git a/test_regress/t/t_lint_implicit_type_bad.py b/test_regress/t/t_lint_implicit_type_bad.py index c0608225e..e15e088e1 100755 --- a/test_regress/t/t_lint_implicit_type_bad.py +++ b/test_regress/t/t_lint_implicit_type_bad.py @@ -11,7 +11,8 @@ import vltest_bootstrap test.scenarios('vlt') -test.lint(verilator_flags2=["--lint-only -Wall -Wno-DECLFILENAME"], +# --debug-check adds extra internal message, otherwise golden log would vary +test.lint(verilator_flags2=["--lint-only --debug-check -Wall -Wno-DECLFILENAME"], fails=True, expect_filename=test.golden_filename) diff --git a/test_regress/t/t_lint_implicit_type_bad.v b/test_regress/t/t_lint_implicit_type_bad.v index 24a373808..3262dd6d4 100644 --- a/test_regress/t/t_lint_implicit_type_bad.v +++ b/test_regress/t/t_lint_implicit_type_bad.v @@ -4,9 +4,15 @@ // any use, without warranty, 2024 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 +class imp_Cls_conflict; +endclass + module t; - typedef int imp_type_conflict; + typedef int imp_typedef_conflict; + localparam type imp_PARAM_conflict; `default_nettype wire - assign imp_type_conflict = 1'b1; + assign imp_typedef_conflict = 1'b1; + assign imp_Cls_conflict = 1'b1; + assign imp_PARAM_conflict = 1'b1; endmodule