diff --git a/docs/gen/ex_BADVLTPRAGMA_faulty.rst b/docs/gen/ex_BADVLTPRAGMA_faulty.rst new file mode 100644 index 000000000..62725c09b --- /dev/null +++ b/docs/gen/ex_BADVLTPRAGMA_faulty.rst @@ -0,0 +1,5 @@ +.. comment: generated by t_lint_badvltpragma_bad +.. code-block:: sv + :emphasize-lines: 1 + + // verilator lintt_off WIDTH //<--- Warning (lint_off misspelled) diff --git a/docs/gen/ex_BADVLTPRAGMA_msg.rst b/docs/gen/ex_BADVLTPRAGMA_msg.rst new file mode 100644 index 000000000..ea57d297e --- /dev/null +++ b/docs/gen/ex_BADVLTPRAGMA_msg.rst @@ -0,0 +1,7 @@ +.. comment: generated by t_lint_badvltpragma_bad +.. code-block:: + :emphasize-lines: 1,2 + + %Error-BADVLTPRAGMA: example.v:1:4 Unknown verilator comment: '/*verilator lintt_off WIDTH <--- Warning (lint_off misspelled)*/' + 7 | /*verilator lintt_off WIDTH <--- Warning (lint_off misspelled)*/ + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/guide/warnings.rst b/docs/guide/warnings.rst index bf015760f..b6cf9622f 100644 --- a/docs/guide/warnings.rst +++ b/docs/guide/warnings.rst @@ -175,6 +175,14 @@ List Of Warnings An error that a `/*verilator ...*/` metacomment pragma is badly formed or not understood. + Faulty example: + + .. include:: ../../docs/gen/ex_BADVLTPRAGMA_faulty.rst + + Results in: + + .. include:: ../../docs/gen/ex_BADVLTPRAGMA_msg.rst + This error may be disabled with a lint_off BADVLTPRAGMA metacomment. diff --git a/test_regress/driver.py b/test_regress/driver.py index fa7fd253e..d69c66da5 100755 --- a/test_regress/driver.py +++ b/test_regress/driver.py @@ -2633,6 +2633,7 @@ class VlTest: fhw.write(" :emphasize-lines: " + emph + "\n") fhw.write("\n") for line in out: + line = re.sub(r' +$', '', line) fhw.write(line) self.files_identical(temp_fn, out_filename) diff --git a/test_regress/t/t_dist_error_format.py b/test_regress/t/t_dist_error_format.py index 473dffb57..154ae7084 100755 --- a/test_regress/t/t_dist_error_format.py +++ b/test_regress/t/t_dist_error_format.py @@ -29,6 +29,7 @@ def formats(): for line in wholefile.splitlines(): lineno += 1 line = re.sub(r'(\$display|\$write).*\".*%(Error|Warning)', '', line) + line = re.sub(r'<---.*', '', line) if (re.search(r'(Error|Warning)', line) and not re.search(r'^\s*