From 2c0372acdfce790e93d692175cc36b9cbe56f0ca Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Wed, 30 Apr 2025 23:02:19 -0400 Subject: [PATCH] Tests: Fix relocation of extract tests --- test_regress/t/t_assert_comp_bad.py | 16 ++++++++-------- test_regress/t/t_lint_badvltpragma_bad.py | 9 +++++++-- test_regress/t/t_lint_didnotconverge_bad.py | 4 ++-- .../t/t_lint_didnotconverge_nodbg_bad.py | 2 +- test_regress/t/t_lint_multidriven_bad.py | 4 ++-- test_regress/t/t_lint_pinmissing_bad.py | 4 ++-- test_regress/t/t_lint_pkgnodecl_bad.py | 4 ++-- test_regress/t/t_lint_procassinit_bad.py | 11 ++++++++--- test_regress/t/t_lint_stmtdly_bad.py | 4 ++-- test_regress/t/t_lint_widthexpand_docs_bad.py | 6 +++--- test_regress/t/t_var_bad_hide_docs.py | 4 ++-- 11 files changed, 39 insertions(+), 29 deletions(-) diff --git a/test_regress/t/t_assert_comp_bad.py b/test_regress/t/t_assert_comp_bad.py index 12cec4f93..114fbe952 100755 --- a/test_regress/t/t_assert_comp_bad.py +++ b/test_regress/t/t_assert_comp_bad.py @@ -23,35 +23,35 @@ test.compile(verilator_flags2=['--assert'], expect_filename=test.golden_filename) test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_USERWARN_faulty.rst", + out_filename=root + "/docs/gen/ex_USERWARN_faulty.rst", regexp=r'\$warn.*User') test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_USERERROR_faulty.rst", + out_filename=root + "/docs/gen/ex_USERERROR_faulty.rst", regexp=r'\$error.*User') test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_USERINFO_faulty.rst", + out_filename=root + "/docs/gen/ex_USERINFO_faulty.rst", regexp=r'\$info.*User') test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_USERFATAL_faulty.rst", + out_filename=root + "/docs/gen/ex_USERFATAL_faulty.rst", regexp=r'\$fatal.*User') test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_USERWARN_msg.rst", + out_filename=root + "/docs/gen/ex_USERWARN_msg.rst", regexp=r'USERWARN:.* User') test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_USERERROR_msg.rst", + out_filename=root + "/docs/gen/ex_USERERROR_msg.rst", regexp=r'USERERROR:.* User') test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_USERINFO_msg.rst", + out_filename=root + "/docs/gen/ex_USERINFO_msg.rst", regexp=r'-Info:.* User') test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_USERFATAL_msg.rst", + out_filename=root + "/docs/gen/ex_USERFATAL_msg.rst", regexp=r'USERFATAL:.* User') test.passes() diff --git a/test_regress/t/t_lint_badvltpragma_bad.py b/test_regress/t/t_lint_badvltpragma_bad.py index 4ddd05c4a..1c907c181 100755 --- a/test_regress/t/t_lint_badvltpragma_bad.py +++ b/test_regress/t/t_lint_badvltpragma_bad.py @@ -11,14 +11,19 @@ import vltest_bootstrap test.scenarios('vlt') +root = ".." + +if not os.path.exists(root + "/.git"): + test.skip("Not in a git repository") + test.lint(fails=True, expect_filename=test.golden_filename) test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_BADVLTPRAGMA_faulty.rst", + out_filename=root + "/docs/gen/ex_BADVLTPRAGMA_faulty.rst", lines="7") test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_BADVLTPRAGMA_msg.rst", + out_filename=root + "/docs/gen/ex_BADVLTPRAGMA_msg.rst", lines="1-3") test.passes() diff --git a/test_regress/t/t_lint_didnotconverge_bad.py b/test_regress/t/t_lint_didnotconverge_bad.py index 40e40f26e..62e56833c 100755 --- a/test_regress/t/t_lint_didnotconverge_bad.py +++ b/test_regress/t/t_lint_didnotconverge_bad.py @@ -21,11 +21,11 @@ test.compile(verilator_flags2=["--prof-cfuncs"]) test.execute(fails=True, expect_filename=test.golden_filename) test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_DIDNOTCONVERGE_faulty.rst", + out_filename=root + "/docs/gen/ex_DIDNOTCONVERGE_faulty.rst", lines="16-17") test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_DIDNOTCONVERGE_msg.rst", + out_filename=root + "/docs/gen/ex_DIDNOTCONVERGE_msg.rst", lines="1-2") test.passes() diff --git a/test_regress/t/t_lint_didnotconverge_nodbg_bad.py b/test_regress/t/t_lint_didnotconverge_nodbg_bad.py index 1d53c8c93..4ca34912b 100755 --- a/test_regress/t/t_lint_didnotconverge_nodbg_bad.py +++ b/test_regress/t/t_lint_didnotconverge_nodbg_bad.py @@ -22,7 +22,7 @@ test.compile(make_flags=['CPPFLAGS_ADD=-UVL_DEBUG']) test.execute(fails=True, expect_filename=test.golden_filename) test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_DIDNOTCONVERGE_nodbg_msg.rst", + out_filename=root + "/docs/gen/ex_DIDNOTCONVERGE_nodbg_msg.rst", lines="1") test.passes() diff --git a/test_regress/t/t_lint_multidriven_bad.py b/test_regress/t/t_lint_multidriven_bad.py index ed3410fdd..f84ef04a2 100755 --- a/test_regress/t/t_lint_multidriven_bad.py +++ b/test_regress/t/t_lint_multidriven_bad.py @@ -19,11 +19,11 @@ if not os.path.exists(root + "/.git"): test.lint(fails=True, expect_filename=test.golden_filename) test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_MULTIDRIVEN_faulty.rst", + out_filename=root + "/docs/gen/ex_MULTIDRIVEN_faulty.rst", lines="31-36") test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_MULTIDRIVEN_msg.rst", + out_filename=root + "/docs/gen/ex_MULTIDRIVEN_msg.rst", lines="10,11,14") test.passes() diff --git a/test_regress/t/t_lint_pinmissing_bad.py b/test_regress/t/t_lint_pinmissing_bad.py index 3f80106f9..78a6d6a13 100755 --- a/test_regress/t/t_lint_pinmissing_bad.py +++ b/test_regress/t/t_lint_pinmissing_bad.py @@ -19,11 +19,11 @@ if not os.path.exists(root + "/.git"): test.lint(fails=True, expect_filename=test.golden_filename) test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_PINMISSING_faulty.rst", + out_filename=root + "/docs/gen/ex_PINMISSING_faulty.rst", lines="7-12") test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_PINMISSING_msg.rst", + out_filename=root + "/docs/gen/ex_PINMISSING_msg.rst", lines="1-1") test.passes() diff --git a/test_regress/t/t_lint_pkgnodecl_bad.py b/test_regress/t/t_lint_pkgnodecl_bad.py index 21d9be319..77102e664 100755 --- a/test_regress/t/t_lint_pkgnodecl_bad.py +++ b/test_regress/t/t_lint_pkgnodecl_bad.py @@ -19,11 +19,11 @@ if not os.path.exists(root + "/.git"): test.lint(fails=True, expect_filename=test.golden_filename) test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_PKGNODECL_faulty.rst", + out_filename=root + "/docs/gen/ex_PKGNODECL_faulty.rst", lines="7-12") test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_PKGNODECL_msg.rst", + out_filename=root + "/docs/gen/ex_PKGNODECL_msg.rst", lines="1") test.passes() diff --git a/test_regress/t/t_lint_procassinit_bad.py b/test_regress/t/t_lint_procassinit_bad.py index 05ca0a399..28f124234 100755 --- a/test_regress/t/t_lint_procassinit_bad.py +++ b/test_regress/t/t_lint_procassinit_bad.py @@ -11,20 +11,25 @@ import vltest_bootstrap test.scenarios('vlt') +root = ".." + +if not os.path.exists(root + "/.git"): + test.skip("Not in a git repository") + test.lint(verilator_flags2=['-Wall -Wno-DECLFILENAME'], fails=True, expect_filename=test.golden_filename) test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_PROCASSINIT_faulty.rst", + out_filename=root + "/docs/gen/ex_PROCASSINIT_faulty.rst", lines="26-32") test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_PROCASSINIT_fixed.rst", + out_filename=root + "/docs/gen/ex_PROCASSINIT_fixed.rst", lines="36-45") test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_PROCASSINIT_msg.rst", + out_filename=root + "/docs/gen/ex_PROCASSINIT_msg.rst", lines="1-9") test.passes() diff --git a/test_regress/t/t_lint_stmtdly_bad.py b/test_regress/t/t_lint_stmtdly_bad.py index cf06e63a2..953505d81 100755 --- a/test_regress/t/t_lint_stmtdly_bad.py +++ b/test_regress/t/t_lint_stmtdly_bad.py @@ -19,11 +19,11 @@ if not os.path.exists(root + "/.git"): test.lint(verilator_flags2=["--no-timing"], fails=True, expect_filename=test.golden_filename) test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_STMTDLY_faulty.rst", + out_filename=root + "/docs/gen/ex_STMTDLY_faulty.rst", lines="10") test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_STMTDLY_msg.rst", + out_filename=root + "/docs/gen/ex_STMTDLY_msg.rst", lines="1") test.passes() diff --git a/test_regress/t/t_lint_widthexpand_docs_bad.py b/test_regress/t/t_lint_widthexpand_docs_bad.py index 2b57b2bd5..6d7a81fa7 100755 --- a/test_regress/t/t_lint_widthexpand_docs_bad.py +++ b/test_regress/t/t_lint_widthexpand_docs_bad.py @@ -21,16 +21,16 @@ test.lint(verilator_flags2=["--lint-only"], expect_filename=test.golden_filename) test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_WIDTHEXPAND_1_faulty.rst", + out_filename=root + "/docs/gen/ex_WIDTHEXPAND_1_faulty.rst", lines="8-10") test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_WIDTHEXPAND_1_msg.rst", + out_filename=root + "/docs/gen/ex_WIDTHEXPAND_1_msg.rst", lineno_adjust=-7, regexp=r'Warning-WIDTH') test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_WIDTHEXPAND_1_fixed.rst", + out_filename=root + "/docs/gen/ex_WIDTHEXPAND_1_fixed.rst", lines="18") test.passes() diff --git a/test_regress/t/t_var_bad_hide_docs.py b/test_regress/t/t_var_bad_hide_docs.py index fea969814..837cb2dc9 100755 --- a/test_regress/t/t_var_bad_hide_docs.py +++ b/test_regress/t/t_var_bad_hide_docs.py @@ -21,11 +21,11 @@ test.lint(verilator_flags2=["--lint-only -Wwarn-VARHIDDEN"], expect_filename=test.golden_filename) test.extract(in_filename=test.top_filename, - out_filename="../docs/gen/ex_VARHIDDEN_faulty.rst", + out_filename=root + "/docs/gen/ex_VARHIDDEN_faulty.rst", regexp=r'(module t|integer|endmodule)') test.extract(in_filename=test.golden_filename, - out_filename="../docs/gen/ex_VARHIDDEN_msg.rst", + out_filename=root + "/docs/gen/ex_VARHIDDEN_msg.rst", lineno_adjust=-6, regexp=r'(var_bad_hide)')