From f5f5cd522b842091488404e499142c7b10179a7b Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Wed, 12 Jun 2019 21:05:02 -0400 Subject: [PATCH] Tests: Make standard lint() to replace inconsistent compile() --- test_regress/driver.pl | 44 ++++++++++++------- test_regress/t/t_assert_dup_bad.pl | 5 +-- test_regress/t/t_assert_property_fail_1.pl | 2 +- test_regress/t/t_bitsel_const_bad.pl | 5 +-- test_regress/t/t_bitsel_wire_array_bad.pl | 5 +-- test_regress/t/t_case_default_bad.pl | 5 +-- test_regress/t/t_case_genx_bad.pl | 5 +-- test_regress/t/t_case_x_bad.pl | 5 +-- test_regress/t/t_case_zx_bad.pl | 5 +-- test_regress/t/t_clk_scope_bad.pl | 5 +-- test_regress/t/t_concat_large_bad.pl | 5 +-- test_regress/t/t_const_bad.pl | 8 +--- test_regress/t/t_const_dec_mixed_bad.pl | 5 +-- test_regress/t/t_const_overflow_bad.pl | 5 +-- test_regress/t/t_debug_fatalsrc_bt_bad.pl | 4 +- test_regress/t/t_debug_sigsegv_bt_bad.pl | 4 +- test_regress/t/t_display_bad.pl | 5 +-- test_regress/t/t_dpi_2exp_bad.pl | 5 +-- test_regress/t/t_dpi_dup_bad.pl | 5 +-- test_regress/t/t_dpi_exp_bad.pl | 7 ++- test_regress/t/t_dpi_logic_bad.pl | 5 +-- test_regress/t/t_dpi_name_bad.pl | 5 +-- test_regress/t/t_dpi_openreg_bad.pl | 5 +-- test_regress/t/t_enum_overlap_bad.pl | 5 +-- test_regress/t/t_flag_future.pl | 5 +-- test_regress/t/t_flag_nomod_bad.pl | 3 +- test_regress/t/t_flag_relinc.pl | 5 +-- test_regress/t/t_flag_werror_bad1.pl | 5 +-- test_regress/t/t_flag_werror_bad2.pl | 3 +- test_regress/t/t_flag_wfatal.pl | 7 +-- test_regress/t/t_flag_woff.pl | 7 +-- test_regress/t/t_for_comma_bad.pl | 5 +-- test_regress/t/t_func_bad.pl | 5 +-- test_regress/t/t_func_bad_width.pl | 5 +-- test_regress/t/t_func_begin2.pl | 9 ++-- test_regress/t/t_func_const2_bad.pl | 5 +-- test_regress/t/t_func_const_bad.pl | 5 +-- .../t/t_func_const_packed_array_bad.pl | 5 +-- .../t/t_func_const_packed_struct_bad.pl | 5 +-- .../t/t_func_const_packed_struct_bad2.pl | 5 +-- test_regress/t/t_func_const_struct_bad.pl | 5 +-- test_regress/t/t_func_task_bad.pl | 5 +-- test_regress/t/t_func_tie_bad.pl | 5 +-- test_regress/t/t_func_wide_out_bad.pl | 5 +-- test_regress/t/t_gate_unsup.pl | 7 +-- test_regress/t/t_gen_cond_bitrange_bad.pl | 5 +-- test_regress/t/t_gen_var_bad.pl | 5 +-- test_regress/t/t_genvar_misuse_bad.pl | 3 +- test_regress/t/t_hierarchy_identifier_bad.pl | 5 +-- test_regress/t/t_hierarchy_unnamed.pl | 9 +--- test_regress/t/t_initial_dlyass_bad.pl | 5 +-- test_regress/t/t_inst_array_bad.pl | 5 +-- test_regress/t/t_inst_misarray_bad.pl | 8 +--- test_regress/t/t_inst_missing.pl | 9 ++-- test_regress/t/t_inst_missing_bad.pl | 6 +-- test_regress/t/t_inst_overwide_bad.pl | 8 +--- .../t/t_interface_array_nocolon_bad.pl | 5 +-- test_regress/t/t_interface_arraymux.pl | 10 +---- test_regress/t/t_interface_mismodport_bad.pl | 8 +--- test_regress/t/t_interface_param1.pl | 9 +--- test_regress/t/t_interface_top_bad.pl | 8 +--- test_regress/t/t_interface_typo_bad.pl | 8 +--- test_regress/t/t_lint_always_comb_bad.pl | 8 +--- test_regress/t/t_lint_always_comb_iface.pl | 10 +---- test_regress/t/t_lint_blksync_bad.pl | 7 +-- test_regress/t/t_lint_blksync_loop.pl | 8 +--- test_regress/t/t_lint_block_redecl_bad.pl | 6 +-- test_regress/t/t_lint_bsspace_bad.pl | 6 +-- test_regress/t/t_lint_colonplus_bad.pl | 6 +-- test_regress/t/t_lint_comb_bad.pl | 6 +-- test_regress/t/t_lint_comb_use.pl | 7 +-- test_regress/t/t_lint_declfilename.pl | 9 +--- test_regress/t/t_lint_declfilename_bad.pl | 7 +-- test_regress/t/t_lint_defparam.pl | 9 +--- test_regress/t/t_lint_defparam_bad.pl | 7 +-- test_regress/t/t_lint_ifdepth_bad.pl | 7 +-- test_regress/t/t_lint_implicit_bad.pl | 6 +-- test_regress/t/t_lint_implicit_port.pl | 2 +- test_regress/t/t_lint_importstar_bad.pl | 9 ++-- test_regress/t/t_lint_incabspath.pl | 9 +--- test_regress/t/t_lint_incabspath_bad.pl | 7 +-- test_regress/t/t_lint_infinite.pl | 8 +--- test_regress/t/t_lint_input_eq_bad.pl | 8 +--- test_regress/t/t_lint_latch_bad.pl | 9 ++-- test_regress/t/t_lint_mod_paren_bad.pl | 5 +-- test_regress/t/t_lint_modport_dir_bad.pl | 7 +-- test_regress/t/t_lint_multidriven_bad.pl | 8 +--- test_regress/t/t_lint_once_bad.pl | 7 +-- test_regress/t/t_lint_only.pl | 9 +--- test_regress/t/t_lint_pindup_bad.pl | 8 +--- test_regress/t/t_lint_pkg_colon_bad.pl | 8 +--- test_regress/t/t_lint_realcvt_bad.pl | 9 ++-- test_regress/t/t_lint_repeat_bad.pl | 5 +-- test_regress/t/t_lint_restore_bad.pl | 5 +-- test_regress/t/t_lint_setout_bad.pl | 8 +--- test_regress/t/t_lint_setout_bad_noinl.pl | 9 ++-- test_regress/t/t_lint_syncasyncnet_bad.pl | 9 ++-- test_regress/t/t_lint_unsized_bad.pl | 8 +--- test_regress/t/t_lint_unsup_deassign.pl | 9 ++-- test_regress/t/t_lint_unsup_mixed.pl | 9 ++-- test_regress/t/t_lint_unused.pl | 9 ++-- test_regress/t/t_lint_unused_bad.pl | 9 ++-- test_regress/t/t_lint_unused_iface.pl | 7 +-- test_regress/t/t_lint_unused_iface_bad.pl | 7 +-- test_regress/t/t_lint_width.pl | 9 +--- test_regress/t/t_lint_width_bad.pl | 5 +-- test_regress/t/t_math_shift_over_bad.pl | 5 +-- test_regress/t/t_mem_packed_bad.pl | 5 +-- test_regress/t/t_mem_slice_bad.pl | 5 +-- test_regress/t/t_mem_slice_conc_bad.pl | 5 +-- test_regress/t/t_metacmt_onoff.pl | 8 +--- test_regress/t/t_mod_dup_ign.pl | 9 +--- test_regress/t/t_order_loop_bad.pl | 8 +--- test_regress/t/t_package_export_bad.pl | 7 +-- test_regress/t/t_param_circ_bad.pl | 8 +--- test_regress/t/t_param_ddeep_width.pl | 9 +--- test_regress/t/t_param_default_bad.pl | 5 +-- test_regress/t/t_param_default_presv_bad.pl | 6 +-- test_regress/t/t_param_scope_bad.pl | 5 +-- test_regress/t/t_param_sel_range.pl | 10 ++--- test_regress/t/t_param_sel_range_bad.pl | 8 +--- test_regress/t/t_param_up_bad.pl | 8 +--- test_regress/t/t_pipe_exit_bad.pl | 5 +-- test_regress/t/t_pp_circdef_bad.pl | 3 +- test_regress/t/t_pp_dupdef_bad.pl | 3 +- test_regress/t/t_pp_misdef_bad.pl | 3 +- test_regress/t/t_pp_underline_bad.pl | 3 +- test_regress/t/t_preproc_inc_bad.pl | 3 +- test_regress/t/t_preproc_undefineall.pl | 8 +--- test_regress/t/t_select_bad_range.pl | 5 +-- test_regress/t/t_select_bad_range2.pl | 5 +-- test_regress/t/t_select_bad_range3.pl | 5 +-- test_regress/t/t_select_bad_tri.pl | 5 +-- test_regress/t/t_select_index2.pl | 9 +--- .../t/t_slice_struct_array_modport.pl | 10 +---- test_regress/t/t_struct_anon.pl | 9 +--- test_regress/t/t_struct_nest.pl | 9 +--- test_regress/t/t_tri_pullvec_bad.pl | 5 +-- test_regress/t/t_typedef_circ_bad.pl | 5 +-- test_regress/t/t_udp_lint.pl | 7 +-- test_regress/t/t_var_bad_hide.pl | 8 ++-- test_regress/t/t_var_bad_hide2.pl | 6 +-- test_regress/t/t_var_bad_sv.pl | 5 +-- test_regress/t/t_var_const_bad.pl | 5 +-- test_regress/t/t_var_dup_bad.pl | 3 +- test_regress/t/t_var_in_assign_bad.pl | 5 ++- test_regress/t/t_var_ref_bad1.pl | 8 +--- test_regress/t/t_var_ref_bad2.pl | 8 +--- test_regress/t/t_var_ref_bad3.pl | 8 +--- test_regress/t/t_var_vec_sel.pl | 10 +---- test_regress/t/t_vlt_warn.pl | 7 +-- test_regress/t/t_wire_beh_bad.pl | 4 +- 152 files changed, 331 insertions(+), 675 deletions(-) diff --git a/test_regress/driver.pl b/test_regress/driver.pl index 2bb775865..67d12fced 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -37,15 +37,15 @@ $SIG{TERM} = sub { $Fork->kill_tree_all('TERM') if $Fork; die "Quitting...\n"; } # Map of all scenarios, with the names used to enable them our %All_Scenarios - = (dist => [ "dist"], - atsim => ["simulator", "atsim"], - ghdl => ["simulator", "ghdl"], - iv => ["simulator", "iv"], - ms => ["simulator", "ms"], - nc => ["simulator", "nc"], - vcs => ["simulator", "vcs"], - vlt => ["simulator", "vlt_all", "vlt"], - vltmt => ["simulator", "vlt_all", "vltmt"], + = (dist => [ "dist"], + atsim => [ "simulator", "atsim"], + ghdl => ["linter", "simulator", "ghdl"], + iv => [ "simulator", "iv"], + ms => ["linter", "simulator", "ms"], + nc => ["linter", "simulator", "nc"], + vcs => ["linter", "simulator", "vcs"], + vlt => ["linter", "simulator", "vlt_all", "vlt"], + vltmt => [ "simulator", "vlt_all", "vltmt"], ); #====================================================================== @@ -641,6 +641,19 @@ sub compile_vlt_flags { return @cmdargs; } +sub lint { + my $self = (ref $_[0] ? shift : $Self); + my %param = (# + %{$self}, # Default arguments are from $self + # Lint specific default overrides + make_main => 0, + make_top_shell => 0, + verilator_flags2 => ["--lint-only"], + verilator_make_gcc => 0, + @_); + $self->compile(%param); +} + sub compile { my $self = (ref $_[0]? shift : $Self); my %param = (%{$self}, @_); # Default arguments are from $self @@ -1912,9 +1925,9 @@ should be used. =item fails -Set to 1 to indicate this step (C or C) is expected to -fail. Tests that are expected to fail generally have _bad in their -filename. +Set to 1 to indicate this step (C or C or C) is +expected to fail. Tests that are expected to fail generally have _bad in +their filename. =item make_main @@ -2039,10 +2052,9 @@ has succeeded. However, in the case of tests that are designed to fail at compile time, it is the only option. For example: compile( - v_flags2 => ["--lint-only"], - fails=>1, - expect_filename => $Self->{golden_filename}, - ); + fails => 1, + expect_filename => $Self->{golden_filename}, + ); Note expect_filename strips some debugging information from the logfile when comparing. diff --git a/test_regress/t/t_assert_dup_bad.pl b/test_regress/t/t_assert_dup_bad.pl index 8bc867659..b09f43e8b 100755 --- a/test_regress/t/t_assert_dup_bad.pl +++ b/test_regress/t/t_assert_dup_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_assert_property_fail_1.pl b/test_regress/t/t_assert_property_fail_1.pl index 1901e0cc8..86ead013e 100755 --- a/test_regress/t/t_assert_property_fail_1.pl +++ b/test_regress/t/t_assert_property_fail_1.pl @@ -17,7 +17,7 @@ compile( ); execute( - fails => 1 + fails => 1, ); file_grep($Self->{run_log_filename}, qr/'assert property' failed/); diff --git a/test_regress/t/t_bitsel_const_bad.pl b/test_regress/t/t_bitsel_const_bad.pl index 8bc867659..b09f43e8b 100755 --- a/test_regress/t/t_bitsel_const_bad.pl +++ b/test_regress/t/t_bitsel_const_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_bitsel_wire_array_bad.pl b/test_regress/t/t_bitsel_wire_array_bad.pl index 7a410958c..98eea8856 100755 --- a/test_regress/t/t_bitsel_wire_array_bad.pl +++ b/test_regress/t/t_bitsel_wire_array_bad.pl @@ -7,12 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); # Comple time only test -compile( - verilator_flags2 => ["--lint-only"], +lint( fails => 1, expect => '.*%Error: t/t_bitsel_wire_array_bad.v:\d+: Illegal assignment of constant to unpacked array diff --git a/test_regress/t/t_case_default_bad.pl b/test_regress/t/t_case_default_bad.pl index da769e338..956310b68 100755 --- a/test_regress/t/t_case_default_bad.pl +++ b/test_regress/t/t_case_default_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect => '%Error: t/t_case_default_bad.v:\d+: Multiple default statements in case statement. diff --git a/test_regress/t/t_case_genx_bad.pl b/test_regress/t/t_case_genx_bad.pl index 677f982e6..518625206 100755 --- a/test_regress/t/t_case_genx_bad.pl +++ b/test_regress/t/t_case_genx_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_case_x_bad.pl b/test_regress/t/t_case_x_bad.pl index 770624d54..561271660 100755 --- a/test_regress/t/t_case_x_bad.pl +++ b/test_regress/t/t_case_x_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect => '%Warning-CASEX: t/t_case_x_bad.v:\d+: Suggest casez \(with \?\'s\) in place of casex \(with X\'s\) diff --git a/test_regress/t/t_case_zx_bad.pl b/test_regress/t/t_case_zx_bad.pl index f7d269d18..0262521e7 100755 --- a/test_regress/t/t_case_zx_bad.pl +++ b/test_regress/t/t_case_zx_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect => '%Warning-CASEWITHX: t/t_case_zx_bad.v:\d+: Use of x constant in casez statement, \(perhaps intended \?/z in constant\) diff --git a/test_regress/t/t_clk_scope_bad.pl b/test_regress/t/t_clk_scope_bad.pl index 677f982e6..518625206 100755 --- a/test_regress/t/t_clk_scope_bad.pl +++ b/test_regress/t/t_clk_scope_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_concat_large_bad.pl b/test_regress/t/t_concat_large_bad.pl index f11d3fd4f..b27cd2241 100755 --- a/test_regress/t/t_concat_large_bad.pl +++ b/test_regress/t/t_concat_large_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_const_bad.pl b/test_regress/t/t_const_bad.pl index 453c6abc9..b27cd2241 100755 --- a/test_regress/t/t_const_bad.pl +++ b/test_regress/t/t_const_bad.pl @@ -7,13 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_const_dec_mixed_bad.pl b/test_regress/t/t_const_dec_mixed_bad.pl index 822214e6c..8ac6e5a4e 100755 --- a/test_regress/t/t_const_dec_mixed_bad.pl +++ b/test_regress/t/t_const_dec_mixed_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect => '%Error: t/t_const_dec_mixed_bad.v:\d+: Mixing X/Z/\? with digits not legal in decimal constant: x_1 diff --git a/test_regress/t/t_const_overflow_bad.pl b/test_regress/t/t_const_overflow_bad.pl index 677f982e6..518625206 100755 --- a/test_regress/t/t_const_overflow_bad.pl +++ b/test_regress/t/t_const_overflow_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_debug_fatalsrc_bt_bad.pl b/test_regress/t/t_debug_fatalsrc_bt_bad.pl index 9e8973c20..60fce31c8 100755 --- a/test_regress/t/t_debug_fatalsrc_bt_bad.pl +++ b/test_regress/t/t_debug_fatalsrc_bt_bad.pl @@ -10,8 +10,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); $ENV{VERILATOR_TEST_NO_GDB} and skip("Skipping due to VERILATOR_TEST_NO_GDB"); -compile( - v_flags2 => ["--lint-only --debug --gdbbt --debug-fatalsrc"], +lint( + verilator_flags2 => ["--lint-only --debug --gdbbt --debug-fatalsrc"], fails => 1, expect => '%Error: Internal Error: .*: --debug-fatal-src diff --git a/test_regress/t/t_debug_sigsegv_bt_bad.pl b/test_regress/t/t_debug_sigsegv_bt_bad.pl index 6a6663a7a..f12a27ece 100755 --- a/test_regress/t/t_debug_sigsegv_bt_bad.pl +++ b/test_regress/t/t_debug_sigsegv_bt_bad.pl @@ -10,8 +10,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); $ENV{VERILATOR_TEST_NO_GDB} and skip("Skipping due to VERILATOR_TEST_NO_GDB"); -compile( - v_flags2 => ["--lint-only --debug --gdbbt --debug-sigsegv"], +lint( + verilator_flags2 => ["--lint-only --debug --gdbbt --debug-sigsegv"], fails => $Self->{vlt_all}, expect => '.* diff --git a/test_regress/t/t_display_bad.pl b/test_regress/t/t_display_bad.pl index 8bc867659..385b304e3 100755 --- a/test_regress/t/t_display_bad.pl +++ b/test_regress/t/t_display_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_dpi_2exp_bad.pl b/test_regress/t/t_dpi_2exp_bad.pl index 88a6d3847..a5176d1d1 100755 --- a/test_regress/t/t_dpi_2exp_bad.pl +++ b/test_regress/t/t_dpi_2exp_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect => '%Error: t/t_dpi_2exp_bad.v:11: Function was already DPI Exported, duplicate not allowed: dpix_twice diff --git a/test_regress/t/t_dpi_dup_bad.pl b/test_regress/t/t_dpi_dup_bad.pl index 96456db03..57ecc0da2 100755 --- a/test_regress/t/t_dpi_dup_bad.pl +++ b/test_regress/t/t_dpi_dup_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_dpi_exp_bad.pl b/test_regress/t/t_dpi_exp_bad.pl index db3838a32..b68c7f209 100755 --- a/test_regress/t/t_dpi_exp_bad.pl +++ b/test_regress/t/t_dpi_exp_bad.pl @@ -7,11 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], - fails => $Self->{vlt_all}, +lint( + fails => 1, expect => '%Error: t/t_dpi_exp_bad.v:\d+: DPI functions cannot return > 32 bits or four-state; use a two-state type or task instead: dpix_f_bit48__Vfuncrtn %Error: Exiting due to .*' diff --git a/test_regress/t/t_dpi_logic_bad.pl b/test_regress/t/t_dpi_logic_bad.pl index d5d40c26d..fbf4dbabf 100755 --- a/test_regress/t/t_dpi_logic_bad.pl +++ b/test_regress/t/t_dpi_logic_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect => '%Error: t/t_dpi_logic_bad.v:\d+: DPI function may not return type BASICDTYPE \'logic\' \(IEEE 2017 35.5.5\) diff --git a/test_regress/t/t_dpi_name_bad.pl b/test_regress/t/t_dpi_name_bad.pl index a58de8e4d..89f566bbd 100755 --- a/test_regress/t/t_dpi_name_bad.pl +++ b/test_regress/t/t_dpi_name_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect => '%Error: t/t_dpi_name_bad.v:\d+: DPI function has illegal characters in C identifier name: badly.named diff --git a/test_regress/t/t_dpi_openreg_bad.pl b/test_regress/t/t_dpi_openreg_bad.pl index 96456db03..57ecc0da2 100755 --- a/test_regress/t/t_dpi_openreg_bad.pl +++ b/test_regress/t/t_dpi_openreg_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_enum_overlap_bad.pl b/test_regress/t/t_enum_overlap_bad.pl index 1db26a03a..573f98f12 100755 --- a/test_regress/t/t_enum_overlap_bad.pl +++ b/test_regress/t/t_enum_overlap_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_flag_future.pl b/test_regress/t/t_flag_future.pl index 6d9a5c0a0..6549e85d5 100755 --- a/test_regress/t/t_flag_future.pl +++ b/test_regress/t/t_flag_future.pl @@ -9,11 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( +lint( verilator_flags2 => [qw(--lint-only -Wfuture-FUTURE1 -Wfuture-FUTURE2)], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, ); ok(1); diff --git a/test_regress/t/t_flag_nomod_bad.pl b/test_regress/t/t_flag_nomod_bad.pl index 1db65aa3e..b03c82a27 100755 --- a/test_regress/t/t_flag_nomod_bad.pl +++ b/test_regress/t/t_flag_nomod_bad.pl @@ -9,8 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect => '%Error: No top level module found diff --git a/test_regress/t/t_flag_relinc.pl b/test_regress/t/t_flag_relinc.pl index c506495d1..b1f547b3e 100755 --- a/test_regress/t/t_flag_relinc.pl +++ b/test_regress/t/t_flag_relinc.pl @@ -9,12 +9,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( +lint( v_flags2 => ["--relative-includes", "--lint-only $Self->{t_dir}/t_flag_relinc_dir/chip/t_flag_relinc_sub.v"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, ); ok(1); diff --git a/test_regress/t/t_flag_werror_bad1.pl b/test_regress/t/t_flag_werror_bad1.pl index fbd2c1f5c..3b23709db 100755 --- a/test_regress/t/t_flag_werror_bad1.pl +++ b/test_regress/t/t_flag_werror_bad1.pl @@ -11,9 +11,8 @@ scenarios(vlt => 1); top_filename("t/t_flag_werror.v"); -compile( - v_flags2 => ["--lint-only"], - fails => $Self->{vlt_all}, +lint( + fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_flag_werror_bad2.pl b/test_regress/t/t_flag_werror_bad2.pl index bd48ee93f..daa93d9d7 100755 --- a/test_regress/t/t_flag_werror_bad2.pl +++ b/test_regress/t/t_flag_werror_bad2.pl @@ -11,8 +11,7 @@ scenarios(vlt => 1); top_filename("t/t_flag_werror.v"); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, verilator_flags => [qw(-cc -Werror-WIDTH)], expect_filename => $Self->{golden_filename}, diff --git a/test_regress/t/t_flag_wfatal.pl b/test_regress/t/t_flag_wfatal.pl index 658c8f71f..4f4877afc 100755 --- a/test_regress/t/t_flag_wfatal.pl +++ b/test_regress/t/t_flag_wfatal.pl @@ -11,12 +11,9 @@ scenarios(vlt => 1); top_filename("t/t_flag_wfatal.v"); -compile( - v_flags2 => ["--lint-only -Wno-fatal"], +lint( + verilator_flags2 => ["--lint-only -Wno-fatal"], fails => 0, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_flag_woff.pl b/test_regress/t/t_flag_woff.pl index 7bbcf0f32..3de9ecfaa 100755 --- a/test_regress/t/t_flag_woff.pl +++ b/test_regress/t/t_flag_woff.pl @@ -9,11 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only -Wno-WIDTH"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( + verilator_flags2 => ["--lint-only -Wno-WIDTH"], ); ok(1); diff --git a/test_regress/t/t_for_comma_bad.pl b/test_regress/t/t_for_comma_bad.pl index d0dce49e3..b09f43e8b 100755 --- a/test_regress/t/t_for_comma_bad.pl +++ b/test_regress/t/t_for_comma_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 'vlt'); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_func_bad.pl b/test_regress/t/t_func_bad.pl index 8bc867659..b09f43e8b 100755 --- a/test_regress/t/t_func_bad.pl +++ b/test_regress/t/t_func_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_func_bad_width.pl b/test_regress/t/t_func_bad_width.pl index 96456db03..57ecc0da2 100755 --- a/test_regress/t/t_func_bad_width.pl +++ b/test_regress/t/t_func_bad_width.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_func_begin2.pl b/test_regress/t/t_func_begin2.pl index acfde8d55..c5fa3f628 100755 --- a/test_regress/t/t_func_begin2.pl +++ b/test_regress/t/t_func_begin2.pl @@ -7,13 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only --inline-mult 1"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( + verilator_flags2 => ["--lint-only --inline-mult 1"], ); ok(1); diff --git a/test_regress/t/t_func_const2_bad.pl b/test_regress/t/t_func_const2_bad.pl index e29c27375..727a561fa 100755 --- a/test_regress/t/t_func_const2_bad.pl +++ b/test_regress/t/t_func_const2_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_func_const_bad.pl b/test_regress/t/t_func_const_bad.pl index 8bc867659..b09f43e8b 100755 --- a/test_regress/t/t_func_const_bad.pl +++ b/test_regress/t/t_func_const_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_func_const_packed_array_bad.pl b/test_regress/t/t_func_const_packed_array_bad.pl index e29c27375..727a561fa 100755 --- a/test_regress/t/t_func_const_packed_array_bad.pl +++ b/test_regress/t/t_func_const_packed_array_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_func_const_packed_struct_bad.pl b/test_regress/t/t_func_const_packed_struct_bad.pl index e29c27375..727a561fa 100755 --- a/test_regress/t/t_func_const_packed_struct_bad.pl +++ b/test_regress/t/t_func_const_packed_struct_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_func_const_packed_struct_bad2.pl b/test_regress/t/t_func_const_packed_struct_bad2.pl index e29c27375..727a561fa 100755 --- a/test_regress/t/t_func_const_packed_struct_bad2.pl +++ b/test_regress/t/t_func_const_packed_struct_bad2.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_func_const_struct_bad.pl b/test_regress/t/t_func_const_struct_bad.pl index e29c27375..727a561fa 100755 --- a/test_regress/t/t_func_const_struct_bad.pl +++ b/test_regress/t/t_func_const_struct_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_func_task_bad.pl b/test_regress/t/t_func_task_bad.pl index 0c15dee26..8512ba682 100755 --- a/test_regress/t/t_func_task_bad.pl +++ b/test_regress/t/t_func_task_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect => q{%Error: t/t_func_task_bad.v:\d+: Illegal call of a task as a function: task_as_func diff --git a/test_regress/t/t_func_tie_bad.pl b/test_regress/t/t_func_tie_bad.pl index 46d459dcb..4fdd13faf 100755 --- a/test_regress/t/t_func_tie_bad.pl +++ b/test_regress/t/t_func_tie_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect => q{%Error: t/t_func_tie_bad.v:\d+: Function/task output connected to constant instead of variable: b diff --git a/test_regress/t/t_func_wide_out_bad.pl b/test_regress/t/t_func_wide_out_bad.pl index 8bc867659..b09f43e8b 100755 --- a/test_regress/t/t_func_wide_out_bad.pl +++ b/test_regress/t/t_func_wide_out_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_gate_unsup.pl b/test_regress/t/t_gate_unsup.pl index c60d85dea..af25d4b14 100755 --- a/test_regress/t/t_gate_unsup.pl +++ b/test_regress/t/t_gate_unsup.pl @@ -7,14 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( +lint( # Unsupported: UDP Tables verilator_flags2 => ["--lint-only --bbox-unsup"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, ); ok(1); diff --git a/test_regress/t/t_gen_cond_bitrange_bad.pl b/test_regress/t/t_gen_cond_bitrange_bad.pl index 8bc867659..b09f43e8b 100755 --- a/test_regress/t/t_gen_cond_bitrange_bad.pl +++ b/test_regress/t/t_gen_cond_bitrange_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_gen_var_bad.pl b/test_regress/t/t_gen_var_bad.pl index 8bc867659..b09f43e8b 100755 --- a/test_regress/t/t_gen_var_bad.pl +++ b/test_regress/t/t_gen_var_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_genvar_misuse_bad.pl b/test_regress/t/t_genvar_misuse_bad.pl index 499d0ca3b..7d2854dd9 100755 --- a/test_regress/t/t_genvar_misuse_bad.pl +++ b/test_regress/t/t_genvar_misuse_bad.pl @@ -10,8 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); $Self->{vlt_all} and unsupported("Verilator unsupported, bug408"); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect => '.*%Error: t/t_genvar_misuse_bad.v:\d+: Use of genvar where not convertible to constant: i diff --git a/test_regress/t/t_hierarchy_identifier_bad.pl b/test_regress/t/t_hierarchy_identifier_bad.pl index 8bc867659..385b304e3 100755 --- a/test_regress/t/t_hierarchy_identifier_bad.pl +++ b/test_regress/t/t_hierarchy_identifier_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_hierarchy_unnamed.pl b/test_regress/t/t_hierarchy_unnamed.pl index 76bfa062d..0bafa73ba 100755 --- a/test_regress/t/t_hierarchy_unnamed.pl +++ b/test_regress/t/t_hierarchy_unnamed.pl @@ -7,14 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_initial_dlyass_bad.pl b/test_regress/t/t_initial_dlyass_bad.pl index ab06709d5..08c0db3ed 100755 --- a/test_regress/t/t_initial_dlyass_bad.pl +++ b/test_regress/t/t_initial_dlyass_bad.pl @@ -7,12 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); top_filename("t_initial_dlyass.v"); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect => qr{%Warning-INITIALDLY: t/t_initial_dlyass.v:\d+: Delayed assignments .* diff --git a/test_regress/t/t_inst_array_bad.pl b/test_regress/t/t_inst_array_bad.pl index 677f982e6..518625206 100755 --- a/test_regress/t/t_inst_array_bad.pl +++ b/test_regress/t/t_inst_array_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_inst_misarray_bad.pl b/test_regress/t/t_inst_misarray_bad.pl index 49e80bde3..3f77205ae 100755 --- a/test_regress/t/t_inst_misarray_bad.pl +++ b/test_regress/t/t_inst_misarray_bad.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - verilator_flags2 => ["--lint-only"], +lint( fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_inst_missing.pl b/test_regress/t/t_inst_missing.pl index 20cf980fd..6ff8eb890 100755 --- a/test_regress/t/t_inst_missing.pl +++ b/test_regress/t/t_inst_missing.pl @@ -7,13 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only --Wall -Wno-DECLFILENAME"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( + verilator_flags2 => ["--lint-only --Wall -Wno-DECLFILENAME"], ); ok(1); diff --git a/test_regress/t/t_inst_missing_bad.pl b/test_regress/t/t_inst_missing_bad.pl index 9a2dc5fca..5ed028473 100755 --- a/test_regress/t/t_inst_missing_bad.pl +++ b/test_regress/t/t_inst_missing_bad.pl @@ -7,10 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only --Wall -Wno-DECLFILENAME"], +lint( + verilator_flags2 => ["--lint-only --Wall -Wno-DECLFILENAME"], fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_inst_overwide_bad.pl b/test_regress/t/t_inst_overwide_bad.pl index 7185d952f..2fda6063d 100755 --- a/test_regress/t/t_inst_overwide_bad.pl +++ b/test_regress/t/t_inst_overwide_bad.pl @@ -7,16 +7,12 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); top_filename("t/t_inst_overwide.v"); -compile( - v_flags2 => ["--lint-only"], +lint( verilator_flags => [qw(-cc)], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_interface_array_nocolon_bad.pl b/test_regress/t/t_interface_array_nocolon_bad.pl index 96456db03..57ecc0da2 100755 --- a/test_regress/t/t_interface_array_nocolon_bad.pl +++ b/test_regress/t/t_interface_array_nocolon_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_interface_arraymux.pl b/test_regress/t/t_interface_arraymux.pl index 62c359668..0bafa73ba 100755 --- a/test_regress/t/t_interface_arraymux.pl +++ b/test_regress/t/t_interface_arraymux.pl @@ -7,15 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - verilator_flags2 => ["--lint-only"], - fails => 0, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_interface_mismodport_bad.pl b/test_regress/t/t_interface_mismodport_bad.pl index 1f28eb091..b09f43e8b 100755 --- a/test_regress/t/t_interface_mismodport_bad.pl +++ b/test_regress/t/t_interface_mismodport_bad.pl @@ -7,13 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - verilator_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_interface_param1.pl b/test_regress/t/t_interface_param1.pl index 76bfa062d..0bafa73ba 100755 --- a/test_regress/t/t_interface_param1.pl +++ b/test_regress/t/t_interface_param1.pl @@ -7,14 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_interface_top_bad.pl b/test_regress/t/t_interface_top_bad.pl index 1fd71cfcd..b8f902f45 100755 --- a/test_regress/t/t_interface_top_bad.pl +++ b/test_regress/t/t_interface_top_bad.pl @@ -7,13 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(vlt => 1); -compile( - verilator_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => 1, expect => '%Error: t/t_interface_top_bad.v:\d+: Unsupported: Interfaced port on top level module', diff --git a/test_regress/t/t_interface_typo_bad.pl b/test_regress/t/t_interface_typo_bad.pl index 81d6fe926..129be8e26 100755 --- a/test_regress/t/t_interface_typo_bad.pl +++ b/test_regress/t/t_interface_typo_bad.pl @@ -7,13 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - verilator_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => 1, # Used to be %Error: t/t_order_wireloop.v:\d+: Wire inputs its own output, creating circular logic .wire x=x. # However we no longer gate optimize this diff --git a/test_regress/t/t_lint_always_comb_bad.pl b/test_regress/t/t_lint_always_comb_bad.pl index 1f28eb091..b09f43e8b 100755 --- a/test_regress/t/t_lint_always_comb_bad.pl +++ b/test_regress/t/t_lint_always_comb_bad.pl @@ -7,13 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - verilator_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_always_comb_iface.pl b/test_regress/t/t_lint_always_comb_iface.pl index 3e882fd06..984b510bd 100755 --- a/test_regress/t/t_lint_always_comb_iface.pl +++ b/test_regress/t/t_lint_always_comb_iface.pl @@ -7,15 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], - fails => 0, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_lint_blksync_bad.pl b/test_regress/t/t_lint_blksync_bad.pl index 4da2ba728..af96f5596 100755 --- a/test_regress/t/t_lint_blksync_bad.pl +++ b/test_regress/t/t_lint_blksync_bad.pl @@ -9,12 +9,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt_all => 1); -compile( - v_flags2 => ["--lint-only -Wwarn-BLKSEQ -Wwarn-COMBDLY"], +lint( + verilator_flags2 => ["--lint-only -Wwarn-BLKSEQ -Wwarn-COMBDLY"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_blksync_loop.pl b/test_regress/t/t_lint_blksync_loop.pl index 303cd448e..b89e43ba9 100755 --- a/test_regress/t/t_lint_blksync_loop.pl +++ b/test_regress/t/t_lint_blksync_loop.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( +lint( verilator_flags2 => ["--lint-only -Wwarn-BLKSEQ -Wwarn-COMBDLY"], - fails => 0, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, ); ok(1); diff --git a/test_regress/t/t_lint_block_redecl_bad.pl b/test_regress/t/t_lint_block_redecl_bad.pl index 30fa3175a..f5ffd347a 100755 --- a/test_regress/t/t_lint_block_redecl_bad.pl +++ b/test_regress/t/t_lint_block_redecl_bad.pl @@ -10,12 +10,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt_all => 1); $Self->{vlt_all} and unsupported("Verilator unsupported, bug485, false begin due to WHILE conversion blocks duplicate name detection"); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect => '%Warning: duplicate... %Error: Exiting due to.*', diff --git a/test_regress/t/t_lint_bsspace_bad.pl b/test_regress/t/t_lint_bsspace_bad.pl index 17d16fe0b..1dfc4b1e4 100755 --- a/test_regress/t/t_lint_bsspace_bad.pl +++ b/test_regress/t/t_lint_bsspace_bad.pl @@ -9,11 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - verilator_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => 1, expect => '%Warning-BSSPACE: t/t_lint_bsspace_bad.v:\d+: Backslash followed by whitespace, perhaps the whitespace is accidental\? diff --git a/test_regress/t/t_lint_colonplus_bad.pl b/test_regress/t/t_lint_colonplus_bad.pl index 21b4f790d..385b304e3 100755 --- a/test_regress/t/t_lint_colonplus_bad.pl +++ b/test_regress/t/t_lint_colonplus_bad.pl @@ -9,11 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - verilator_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_comb_bad.pl b/test_regress/t/t_lint_comb_bad.pl index 0fca86935..b984faf66 100755 --- a/test_regress/t/t_lint_comb_bad.pl +++ b/test_regress/t/t_lint_comb_bad.pl @@ -9,11 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - verilator_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => 1, expect => q{%Error: t/t_lint_comb_bad.v:\d+: syntax error, unexpected '@' diff --git a/test_regress/t/t_lint_comb_use.pl b/test_regress/t/t_lint_comb_use.pl index be0635e49..54d7bac02 100755 --- a/test_regress/t/t_lint_comb_use.pl +++ b/test_regress/t/t_lint_comb_use.pl @@ -7,14 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( +lint( verilator_flags2 => ["--lint-only --bbox-sys"], fails => 0, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, ); ok(1); diff --git a/test_regress/t/t_lint_declfilename.pl b/test_regress/t/t_lint_declfilename.pl index 369d69707..ab4b334e4 100755 --- a/test_regress/t/t_lint_declfilename.pl +++ b/test_regress/t/t_lint_declfilename.pl @@ -7,14 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_lint_declfilename_bad.pl b/test_regress/t/t_lint_declfilename_bad.pl index 5c9e66ac0..debd1ad78 100755 --- a/test_regress/t/t_lint_declfilename_bad.pl +++ b/test_regress/t/t_lint_declfilename_bad.pl @@ -11,12 +11,9 @@ scenarios(vlt => 1); top_filename("t/t_lint_declfilename.v"); -compile( - v_flags2 => ["--lint-only -Wall"], +lint( + verilator_flags2 => ["--lint-only -Wall"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_defparam.pl b/test_regress/t/t_lint_defparam.pl index 369d69707..ab4b334e4 100755 --- a/test_regress/t/t_lint_defparam.pl +++ b/test_regress/t/t_lint_defparam.pl @@ -7,14 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_lint_defparam_bad.pl b/test_regress/t/t_lint_defparam_bad.pl index 706d2b88a..f5054ec11 100755 --- a/test_regress/t/t_lint_defparam_bad.pl +++ b/test_regress/t/t_lint_defparam_bad.pl @@ -11,12 +11,9 @@ scenarios(vlt => 1); top_filename("t/t_lint_defparam.v"); -compile( - v_flags2 => ["--lint-only -Wwarn-style -Wno-DECLFILENAME"], +lint( + verilator_flags2 => ["--lint-only -Wwarn-style -Wno-DECLFILENAME"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_ifdepth_bad.pl b/test_regress/t/t_lint_ifdepth_bad.pl index 2ccfabd1d..8b5c00f6c 100755 --- a/test_regress/t/t_lint_ifdepth_bad.pl +++ b/test_regress/t/t_lint_ifdepth_bad.pl @@ -9,12 +9,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt_all => 1); -compile( - v_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME --if-depth 10"], +lint( + verilator_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME --if-depth 10"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_implicit_bad.pl b/test_regress/t/t_lint_implicit_bad.pl index 45b79cf32..d22e7230f 100755 --- a/test_regress/t/t_lint_implicit_bad.pl +++ b/test_regress/t/t_lint_implicit_bad.pl @@ -7,12 +7,12 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); top_filename("t/t_lint_implicit.v"); -compile( - v_flags2 => ["--lint-only -Wwarn-IMPLICIT"], +lint( + verilator_flags2 => ["--lint-only -Wwarn-IMPLICIT"], fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_implicit_port.pl b/test_regress/t/t_lint_implicit_port.pl index 5c8e80b1f..4288859cb 100755 --- a/test_regress/t/t_lint_implicit_port.pl +++ b/test_regress/t/t_lint_implicit_port.pl @@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt_all => 1); compile( - v_flags2 => ["-Wno-IMPLICIT"], + verilator_flags2 => ["-Wno-IMPLICIT"], ); ok(1); diff --git a/test_regress/t/t_lint_importstar_bad.pl b/test_regress/t/t_lint_importstar_bad.pl index 7029a42d0..91df2c0f5 100755 --- a/test_regress/t/t_lint_importstar_bad.pl +++ b/test_regress/t/t_lint_importstar_bad.pl @@ -7,14 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME"], +lint( + verilator_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_incabspath.pl b/test_regress/t/t_lint_incabspath.pl index 160c9d393..ab4b334e4 100755 --- a/test_regress/t/t_lint_incabspath.pl +++ b/test_regress/t/t_lint_incabspath.pl @@ -7,14 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - verilator_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_lint_incabspath_bad.pl b/test_regress/t/t_lint_incabspath_bad.pl index d12605484..c1311d57e 100755 --- a/test_regress/t/t_lint_incabspath_bad.pl +++ b/test_regress/t/t_lint_incabspath_bad.pl @@ -11,12 +11,9 @@ scenarios(vlt => 1); top_filename("t/t_lint_incabspath.v"); -compile( - v_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME"], +lint( + verilator_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_infinite.pl b/test_regress/t/t_lint_infinite.pl index d561c4636..9832155f2 100755 --- a/test_regress/t/t_lint_infinite.pl +++ b/test_regress/t/t_lint_infinite.pl @@ -7,13 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_input_eq_bad.pl b/test_regress/t/t_lint_input_eq_bad.pl index baefcc57c..1430ed85a 100755 --- a/test_regress/t/t_lint_input_eq_bad.pl +++ b/test_regress/t/t_lint_input_eq_bad.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect => '%Error: t/t_lint_input_eq_bad.v:\d+: Unsupported: Default value on module input: i2 %Error: Exiting due to.*', diff --git a/test_regress/t/t_lint_latch_bad.pl b/test_regress/t/t_lint_latch_bad.pl index 9e07056fd..b0c394b27 100755 --- a/test_regress/t/t_lint_latch_bad.pl +++ b/test_regress/t/t_lint_latch_bad.pl @@ -7,14 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only -Wwarn-style -Wno-DECLFILENAME"], +lint( + verilator_flags2 => ["--lint-only -Wwarn-style -Wno-DECLFILENAME"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_mod_paren_bad.pl b/test_regress/t/t_lint_mod_paren_bad.pl index 5fc313e61..568a3f645 100755 --- a/test_regress/t/t_lint_mod_paren_bad.pl +++ b/test_regress/t/t_lint_mod_paren_bad.pl @@ -9,12 +9,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( +lint( verilator_flags2 => ["--lint-only -Wno-DECLFILENAME"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect => q{%Error: t/t_lint_mod_paren_bad.v:\d+: syntax error, unexpected '\(', expecting ';' %Error: Exiting due to .*}, diff --git a/test_regress/t/t_lint_modport_dir_bad.pl b/test_regress/t/t_lint_modport_dir_bad.pl index c36dc274a..267f58ed7 100755 --- a/test_regress/t/t_lint_modport_dir_bad.pl +++ b/test_regress/t/t_lint_modport_dir_bad.pl @@ -7,14 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( +lint( verilator_flags2 => ["--lint-only -Wno-DECLFILENAME"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_multidriven_bad.pl b/test_regress/t/t_lint_multidriven_bad.pl index 022fe59ea..573f98f12 100755 --- a/test_regress/t/t_lint_multidriven_bad.pl +++ b/test_regress/t/t_lint_multidriven_bad.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_once_bad.pl b/test_regress/t/t_lint_once_bad.pl index 4f0e34ed7..12dd2efbb 100755 --- a/test_regress/t/t_lint_once_bad.pl +++ b/test_regress/t/t_lint_once_bad.pl @@ -7,13 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( +lint( verilator_flags2 => ["--lint-only -Wwarn-UNUSED"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_only.pl b/test_regress/t/t_lint_only.pl index 7ac59147b..f2f4a3c08 100755 --- a/test_regress/t/t_lint_only.pl +++ b/test_regress/t/t_lint_only.pl @@ -7,14 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); foreach my $file (glob("$Self->{obj_dir}/*t_lint_only*")) { next if $file =~ /simx_compile.log/; # Made by driver.pl, not Verilator diff --git a/test_regress/t/t_lint_pindup_bad.pl b/test_regress/t/t_lint_pindup_bad.pl index 022fe59ea..573f98f12 100755 --- a/test_regress/t/t_lint_pindup_bad.pl +++ b/test_regress/t/t_lint_pindup_bad.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_pkg_colon_bad.pl b/test_regress/t/t_lint_pkg_colon_bad.pl index 022fe59ea..573f98f12 100755 --- a/test_regress/t/t_lint_pkg_colon_bad.pl +++ b/test_regress/t/t_lint_pkg_colon_bad.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_realcvt_bad.pl b/test_regress/t/t_lint_realcvt_bad.pl index 4c77c2256..8c8597ccf 100755 --- a/test_regress/t/t_lint_realcvt_bad.pl +++ b/test_regress/t/t_lint_realcvt_bad.pl @@ -7,13 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only -Wwarn-REALCVT"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( + verilator_flags2 => ["--lint-only -Wwarn-REALCVT"], fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_repeat_bad.pl b/test_regress/t/t_lint_repeat_bad.pl index 8bc867659..b09f43e8b 100755 --- a/test_regress/t/t_lint_repeat_bad.pl +++ b/test_regress/t/t_lint_repeat_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_restore_bad.pl b/test_regress/t/t_lint_restore_bad.pl index 1d5701949..9832155f2 100755 --- a/test_regress/t/t_lint_restore_bad.pl +++ b/test_regress/t/t_lint_restore_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_setout_bad.pl b/test_regress/t/t_lint_setout_bad.pl index 022fe59ea..573f98f12 100755 --- a/test_regress/t/t_lint_setout_bad.pl +++ b/test_regress/t/t_lint_setout_bad.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_setout_bad_noinl.pl b/test_regress/t/t_lint_setout_bad_noinl.pl index d9722d132..716bf3389 100755 --- a/test_regress/t/t_lint_setout_bad_noinl.pl +++ b/test_regress/t/t_lint_setout_bad_noinl.pl @@ -7,16 +7,13 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); top_filename("t/t_lint_setout_bad.v"); -compile( - v_flags2 => ["--lint-only -Oi"], +lint( + verilator_flags2 => ["--lint-only -Oi"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_syncasyncnet_bad.pl b/test_regress/t/t_lint_syncasyncnet_bad.pl index 2ccfabd1d..9d2f54367 100755 --- a/test_regress/t/t_lint_syncasyncnet_bad.pl +++ b/test_regress/t/t_lint_syncasyncnet_bad.pl @@ -7,14 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME --if-depth 10"], +lint( + verilator_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME --if-depth 10"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_unsized_bad.pl b/test_regress/t/t_lint_unsized_bad.pl index 022fe59ea..573f98f12 100755 --- a/test_regress/t/t_lint_unsized_bad.pl +++ b/test_regress/t/t_lint_unsized_bad.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_unsup_deassign.pl b/test_regress/t/t_lint_unsup_deassign.pl index e7cbe69d1..27b7e1ba7 100755 --- a/test_regress/t/t_lint_unsup_deassign.pl +++ b/test_regress/t/t_lint_unsup_deassign.pl @@ -7,13 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only --bbox-unsup"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( + verilator_flags2 => ["--lint-only --bbox-unsup"], ); ok(1); diff --git a/test_regress/t/t_lint_unsup_mixed.pl b/test_regress/t/t_lint_unsup_mixed.pl index e7cbe69d1..27b7e1ba7 100755 --- a/test_regress/t/t_lint_unsup_mixed.pl +++ b/test_regress/t/t_lint_unsup_mixed.pl @@ -7,13 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only --bbox-unsup"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( + verilator_flags2 => ["--lint-only --bbox-unsup"], ); ok(1); diff --git a/test_regress/t/t_lint_unused.pl b/test_regress/t/t_lint_unused.pl index b3ea3115d..f8c7bf294 100755 --- a/test_regress/t/t_lint_unused.pl +++ b/test_regress/t/t_lint_unused.pl @@ -7,14 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only --bbox-sys --bbox-unsup -Wall -Wno-DECLFILENAME"], +lint( + verilator_flags2 => ["--lint-only --bbox-sys --bbox-unsup -Wall -Wno-DECLFILENAME"], fails => 0, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, ); ok(1); diff --git a/test_regress/t/t_lint_unused_bad.pl b/test_regress/t/t_lint_unused_bad.pl index aa7bc6420..f064f16a6 100755 --- a/test_regress/t/t_lint_unused_bad.pl +++ b/test_regress/t/t_lint_unused_bad.pl @@ -7,14 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only --bbox-sys --bbox-unsup -Wall -Wno-DECLFILENAME"], +lint( + verilator_flags2 => ["--lint-only --bbox-sys --bbox-unsup -Wall -Wno-DECLFILENAME"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_unused_iface.pl b/test_regress/t/t_lint_unused_iface.pl index 7169b4873..ec740171e 100755 --- a/test_regress/t/t_lint_unused_iface.pl +++ b/test_regress/t/t_lint_unused_iface.pl @@ -7,14 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(vlt => 1); -compile( +lint( verilator_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME"], fails => 0, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, ); ok(1); diff --git a/test_regress/t/t_lint_unused_iface_bad.pl b/test_regress/t/t_lint_unused_iface_bad.pl index 169c414fa..94a80eba6 100755 --- a/test_regress/t/t_lint_unused_iface_bad.pl +++ b/test_regress/t/t_lint_unused_iface_bad.pl @@ -7,14 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( +lint( verilator_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME"], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_lint_width.pl b/test_regress/t/t_lint_width.pl index 523059007..8b1228f9f 100755 --- a/test_regress/t/t_lint_width.pl +++ b/test_regress/t/t_lint_width.pl @@ -7,14 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_lint_width_bad.pl b/test_regress/t/t_lint_width_bad.pl index 1d5701949..9832155f2 100755 --- a/test_regress/t/t_lint_width_bad.pl +++ b/test_regress/t/t_lint_width_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_math_shift_over_bad.pl b/test_regress/t/t_math_shift_over_bad.pl index 0b8bbaaaa..a76bb9809 100755 --- a/test_regress/t/t_math_shift_over_bad.pl +++ b/test_regress/t/t_math_shift_over_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - verilator_flags2 => ["--lint-only"], +lint( fails => 1, expect => '%Error: Internal Error: .*: Value too wide for 32-bits expected in this context 64\'h123456789abcdef diff --git a/test_regress/t/t_mem_packed_bad.pl b/test_regress/t/t_mem_packed_bad.pl index 96651ae1c..cf306aa82 100755 --- a/test_regress/t/t_mem_packed_bad.pl +++ b/test_regress/t/t_mem_packed_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - verilator_flags2 => ["--lint-only"], +lint( fails => 1, expect => q{%Error: t/t_mem_packed_bad.v:\d+: CONST '28'h0' unexpected in assignment to unpacked array diff --git a/test_regress/t/t_mem_slice_bad.pl b/test_regress/t/t_mem_slice_bad.pl index f99e228d7..4ba881869 100755 --- a/test_regress/t/t_mem_slice_bad.pl +++ b/test_regress/t/t_mem_slice_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_mem_slice_conc_bad.pl b/test_regress/t/t_mem_slice_conc_bad.pl index 9b64617a5..fd7324fbf 100755 --- a/test_regress/t/t_mem_slice_conc_bad.pl +++ b/test_regress/t/t_mem_slice_conc_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, ); diff --git a/test_regress/t/t_metacmt_onoff.pl b/test_regress/t/t_metacmt_onoff.pl index f5b5f8fd5..6ff127a73 100755 --- a/test_regress/t/t_metacmt_onoff.pl +++ b/test_regress/t/t_metacmt_onoff.pl @@ -7,13 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(vlt => 1); -compile( - verilator_flags2 => [qw(--lint-only)], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_mod_dup_ign.pl b/test_regress/t/t_mod_dup_ign.pl index 5c0335015..cc4c85b1f 100755 --- a/test_regress/t/t_mod_dup_ign.pl +++ b/test_regress/t/t_mod_dup_ign.pl @@ -7,14 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_order_loop_bad.pl b/test_regress/t/t_order_loop_bad.pl index 10de67e00..4e0675420 100755 --- a/test_regress/t/t_order_loop_bad.pl +++ b/test_regress/t/t_order_loop_bad.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect => '%Error: Circular logic when ordering code .* *t/t_order_loop_bad.v:\d+: + Example path: ALWAYS diff --git a/test_regress/t/t_package_export_bad.pl b/test_regress/t/t_package_export_bad.pl index d34ace777..9e56c6000 100755 --- a/test_regress/t/t_package_export_bad.pl +++ b/test_regress/t/t_package_export_bad.pl @@ -7,16 +7,13 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); top_filename("t/t_package_export.v"); -compile( +lint( v_flags2 => ['+define+T_PACKAGE_EXPORT_BAD',], fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect => '%Error: t/t_package_export.v:\d+: Can\'t find definition of scope/variable: PARAM2 %Error: t/t_package_export.v:\d+: Can\'t find definition of scope/variable: PARAM3 diff --git a/test_regress/t/t_param_circ_bad.pl b/test_regress/t/t_param_circ_bad.pl index 022fe59ea..573f98f12 100755 --- a/test_regress/t/t_param_circ_bad.pl +++ b/test_regress/t/t_param_circ_bad.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_param_ddeep_width.pl b/test_regress/t/t_param_ddeep_width.pl index a6554ba87..0bafa73ba 100755 --- a/test_regress/t/t_param_ddeep_width.pl +++ b/test_regress/t/t_param_ddeep_width.pl @@ -7,14 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - verilator_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_param_default_bad.pl b/test_regress/t/t_param_default_bad.pl index 3ce8c1ef2..b09f43e8b 100755 --- a/test_regress/t/t_param_default_bad.pl +++ b/test_regress/t/t_param_default_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_param_default_presv_bad.pl b/test_regress/t/t_param_default_presv_bad.pl index 9de626241..86898f848 100755 --- a/test_regress/t/t_param_default_presv_bad.pl +++ b/test_regress/t/t_param_default_presv_bad.pl @@ -7,12 +7,12 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt => 1); +scenarios(linter => 1); top_filename("t/t_param_default_bad.v"); -compile( - v_flags2 => ["--lint-only --language 1800-2005"], +lint( + verilator_flags2 => ["--lint-only --language 1800-2005"], fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_param_scope_bad.pl b/test_regress/t/t_param_scope_bad.pl index 677f982e6..518625206 100755 --- a/test_regress/t/t_param_scope_bad.pl +++ b/test_regress/t/t_param_scope_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_param_sel_range.pl b/test_regress/t/t_param_sel_range.pl index d3139fae5..8ec012d6b 100755 --- a/test_regress/t/t_param_sel_range.pl +++ b/test_regress/t/t_param_sel_range.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only -Wno-SELRANGE"], - fails => 0, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( + verilator_flags2 => ["--lint-only -Wno-SELRANGE"], ); ok(1); diff --git a/test_regress/t/t_param_sel_range_bad.pl b/test_regress/t/t_param_sel_range_bad.pl index fbe25283e..bf58ad231 100755 --- a/test_regress/t/t_param_sel_range_bad.pl +++ b/test_regress/t/t_param_sel_range_bad.pl @@ -7,16 +7,12 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); top_filename("t/t_param_sel_range.v"); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_param_up_bad.pl b/test_regress/t/t_param_up_bad.pl index 4dde9334b..11f9214d6 100755 --- a/test_regress/t/t_param_up_bad.pl +++ b/test_regress/t/t_param_up_bad.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, expect => '%Error: t/t_param_up_bad.v:\d+: Can\'t find definition of scope/variable: bar .*%Error: Exiting due to.*', diff --git a/test_regress/t/t_pipe_exit_bad.pl b/test_regress/t/t_pipe_exit_bad.pl index 24a1c6b73..cd25112cc 100755 --- a/test_regress/t/t_pipe_exit_bad.pl +++ b/test_regress/t/t_pipe_exit_bad.pl @@ -11,11 +11,8 @@ scenarios(vlt => 1); top_filename("t/t_pipe_filter.v"); -compile( +lint( verilator_flags2 => ['-E --pipe-filter \'perl t/t_pipe_exit_bad.pf\' '], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, stdout_filename => $stdout_filename, fails => 1, expect => diff --git a/test_regress/t/t_pp_circdef_bad.pl b/test_regress/t/t_pp_circdef_bad.pl index e5ca920e2..f48c960f5 100755 --- a/test_regress/t/t_pp_circdef_bad.pl +++ b/test_regress/t/t_pp_circdef_bad.pl @@ -9,8 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect => '%Error: t/t_pp_circdef_bad.v:\d+: Recursive `define or other nested inclusion diff --git a/test_regress/t/t_pp_dupdef_bad.pl b/test_regress/t/t_pp_dupdef_bad.pl index 08a437057..ace749f8a 100755 --- a/test_regress/t/t_pp_dupdef_bad.pl +++ b/test_regress/t/t_pp_dupdef_bad.pl @@ -11,8 +11,7 @@ scenarios(vlt => 1); top_filename("t/t_pp_dupdef.v"); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_pp_misdef_bad.pl b/test_regress/t/t_pp_misdef_bad.pl index 64051b030..5736c7c70 100755 --- a/test_regress/t/t_pp_misdef_bad.pl +++ b/test_regress/t/t_pp_misdef_bad.pl @@ -9,8 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect => '%Error: t/t_pp_misdef_bad.v:\d+: Define or directive not defined: `NOTDEF diff --git a/test_regress/t/t_pp_underline_bad.pl b/test_regress/t/t_pp_underline_bad.pl index 47214f6e3..8ea1c3465 100755 --- a/test_regress/t/t_pp_underline_bad.pl +++ b/test_regress/t/t_pp_underline_bad.pl @@ -9,8 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - verilator_flags2 => ["--lint-only"], +lint( fails => 1, expect => '%Error: t/t_pp_underline_bad.v:\d+: Extra underscore in meta-comment.* diff --git a/test_regress/t/t_preproc_inc_bad.pl b/test_regress/t/t_preproc_inc_bad.pl index 70c332798..ec7744e00 100755 --- a/test_regress/t/t_preproc_inc_bad.pl +++ b/test_regress/t/t_preproc_inc_bad.pl @@ -9,8 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - verilator_flags2 => ["--lint-only"], +lint( fails => 1, # The .vh file has the error, not the .v file expect => diff --git a/test_regress/t/t_preproc_undefineall.pl b/test_regress/t/t_preproc_undefineall.pl index 51080a82b..056297803 100755 --- a/test_regress/t/t_preproc_undefineall.pl +++ b/test_regress/t/t_preproc_undefineall.pl @@ -7,14 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( +lint( v_flags2 => ['+define+PREDEF_COMMAND_LINE'], - verilator_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, ); ok(1); diff --git a/test_regress/t/t_select_bad_range.pl b/test_regress/t/t_select_bad_range.pl index 96456db03..57ecc0da2 100755 --- a/test_regress/t/t_select_bad_range.pl +++ b/test_regress/t/t_select_bad_range.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_select_bad_range2.pl b/test_regress/t/t_select_bad_range2.pl index 96456db03..57ecc0da2 100755 --- a/test_regress/t/t_select_bad_range2.pl +++ b/test_regress/t/t_select_bad_range2.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_select_bad_range3.pl b/test_regress/t/t_select_bad_range3.pl index 96456db03..57ecc0da2 100755 --- a/test_regress/t/t_select_bad_range3.pl +++ b/test_regress/t/t_select_bad_range3.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_select_bad_tri.pl b/test_regress/t/t_select_bad_tri.pl index 96456db03..57ecc0da2 100755 --- a/test_regress/t/t_select_bad_tri.pl +++ b/test_regress/t/t_select_bad_tri.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_select_index2.pl b/test_regress/t/t_select_index2.pl index 76bfa062d..0bafa73ba 100755 --- a/test_regress/t/t_select_index2.pl +++ b/test_regress/t/t_select_index2.pl @@ -7,14 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_slice_struct_array_modport.pl b/test_regress/t/t_slice_struct_array_modport.pl index 62c359668..0bafa73ba 100755 --- a/test_regress/t/t_slice_struct_array_modport.pl +++ b/test_regress/t/t_slice_struct_array_modport.pl @@ -7,15 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - verilator_flags2 => ["--lint-only"], - fails => 0, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_struct_anon.pl b/test_regress/t/t_struct_anon.pl index 76bfa062d..0bafa73ba 100755 --- a/test_regress/t/t_struct_anon.pl +++ b/test_regress/t/t_struct_anon.pl @@ -7,14 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_struct_nest.pl b/test_regress/t/t_struct_nest.pl index 76bfa062d..0bafa73ba 100755 --- a/test_regress/t/t_struct_nest.pl +++ b/test_regress/t/t_struct_nest.pl @@ -7,14 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_tri_pullvec_bad.pl b/test_regress/t/t_tri_pullvec_bad.pl index e88bd5043..2bfe462ad 100755 --- a/test_regress/t/t_tri_pullvec_bad.pl +++ b/test_regress/t/t_tri_pullvec_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_typedef_circ_bad.pl b/test_regress/t/t_typedef_circ_bad.pl index e88bd5043..57ecc0da2 100755 --- a/test_regress/t/t_typedef_circ_bad.pl +++ b/test_regress/t/t_typedef_circ_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_udp_lint.pl b/test_regress/t/t_udp_lint.pl index 89674913f..7b441fd91 100755 --- a/test_regress/t/t_udp_lint.pl +++ b/test_regress/t/t_udp_lint.pl @@ -7,16 +7,13 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(vlt => 1); top_filename("t/t_udp.v"); -compile( +lint( # Unsupported: UDP Tables verilator_flags2 => ["--lint-only --bbox-unsup"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, ); ok(1); diff --git a/test_regress/t/t_var_bad_hide.pl b/test_regress/t/t_var_bad_hide.pl index 42639f55b..2daf76efb 100755 --- a/test_regress/t/t_var_bad_hide.pl +++ b/test_regress/t/t_var_bad_hide.pl @@ -7,11 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only -Wwarn-VARHIDDEN"], - fails => $Self->{vlt_all}, +lint( + verilator_flags2 => ["--lint-only -Wwarn-VARHIDDEN"], + fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_var_bad_hide2.pl b/test_regress/t/t_var_bad_hide2.pl index 42639f55b..c547cb9f9 100755 --- a/test_regress/t/t_var_bad_hide2.pl +++ b/test_regress/t/t_var_bad_hide2.pl @@ -7,10 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only -Wwarn-VARHIDDEN"], +lint( + verilator_flags2 => ["--lint-only -Wwarn-VARHIDDEN"], fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_var_bad_sv.pl b/test_regress/t/t_var_bad_sv.pl index 96456db03..57ecc0da2 100755 --- a/test_regress/t/t_var_bad_sv.pl +++ b/test_regress/t/t_var_bad_sv.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => $Self->{vlt_all}, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_var_const_bad.pl b/test_regress/t/t_var_const_bad.pl index a84eef7e0..209e4aea3 100755 --- a/test_regress/t/t_var_const_bad.pl +++ b/test_regress/t/t_var_const_bad.pl @@ -7,10 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(vlt_all => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_var_dup_bad.pl b/test_regress/t/t_var_dup_bad.pl index cd1612f79..385b304e3 100755 --- a/test_regress/t/t_var_dup_bad.pl +++ b/test_regress/t/t_var_dup_bad.pl @@ -9,8 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - verilator_flags2 => ["--lint-only"], +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_var_in_assign_bad.pl b/test_regress/t/t_var_in_assign_bad.pl index 73451596c..69a6ddcf2 100755 --- a/test_regress/t/t_var_in_assign_bad.pl +++ b/test_regress/t/t_var_in_assign_bad.pl @@ -9,12 +9,13 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only --Mdir obj_lint_only"], +lint( + verilator_flags2 => ["--lint-only --Mdir obj_lint_only"], fails => 1, expect_filename => $Self->{golden_filename}, ); (!-d "obj_lint_only") or error("%Error: lint-only shouldn't make output directory"); + ok(1); 1; diff --git a/test_regress/t/t_var_ref_bad1.pl b/test_regress/t/t_var_ref_bad1.pl index 39542df3e..385b304e3 100755 --- a/test_regress/t/t_var_ref_bad1.pl +++ b/test_regress/t/t_var_ref_bad1.pl @@ -7,13 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_var_ref_bad2.pl b/test_regress/t/t_var_ref_bad2.pl index 39542df3e..b09f43e8b 100755 --- a/test_regress/t/t_var_ref_bad2.pl +++ b/test_regress/t/t_var_ref_bad2.pl @@ -7,13 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_var_ref_bad3.pl b/test_regress/t/t_var_ref_bad3.pl index 3cccb2103..8d6676da4 100755 --- a/test_regress/t/t_var_ref_bad3.pl +++ b/test_regress/t/t_var_ref_bad3.pl @@ -7,13 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only"], - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, +lint( fails => 1, expect => q{%Error: t/t_var_ref_bad3.v:\d+: Unsupported: ref/const ref as primary input/output: bad_primary_ref diff --git a/test_regress/t/t_var_vec_sel.pl b/test_regress/t/t_var_vec_sel.pl index 0a3119351..0bafa73ba 100755 --- a/test_regress/t/t_var_vec_sel.pl +++ b/test_regress/t/t_var_vec_sel.pl @@ -7,15 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(linter => 1); -compile( - v_flags2 => ["--lint-only"], - fails => 0, - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - ); +lint(); ok(1); 1; diff --git a/test_regress/t/t_vlt_warn.pl b/test_regress/t/t_vlt_warn.pl index 59af0f958..f363c7cbe 100755 --- a/test_regress/t/t_vlt_warn.pl +++ b/test_regress/t/t_vlt_warn.pl @@ -9,11 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - verilator_make_gcc => 0, - make_top_shell => 0, - make_main => 0, - v_flags2 => ["--lint-only t/t_vlt_warn.vlt"], +lint( + verilator_flags2 => ["--lint-only t/t_vlt_warn.vlt"], ); ok(1); diff --git a/test_regress/t/t_wire_beh_bad.pl b/test_regress/t/t_wire_beh_bad.pl index 0f424353d..fa3fa6b10 100755 --- a/test_regress/t/t_wire_beh_bad.pl +++ b/test_regress/t/t_wire_beh_bad.pl @@ -9,8 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt => 1); -compile( - v_flags2 => ["--lint-only --language 1364-2001"], +lint( + verilator_flags2 => ["--lint-only --language 1364-2001"], fails => 1, expect_filename => $Self->{golden_filename}, );