From 68e5c95b82fe8c2290b5e163680423bc02c8346b Mon Sep 17 00:00:00 2001 From: Patrick Stewart Date: Mon, 7 Oct 2019 22:15:43 -0400 Subject: [PATCH] Tests: Rename harness flag. No functional change. Signed-off-by: Wilson Snyder --- test_regress/driver.pl | 6 +++--- test_regress/t/t_a3_selftest.pl | 2 +- test_regress/t/t_cdc_async_bad.pl | 2 +- test_regress/t/t_dpi_import_hdr_only.pl | 4 ++-- test_regress/t/t_flag_csplit.pl | 2 +- test_regress/t/t_flag_debug_noleak.pl | 2 +- test_regress/t/t_flag_debugi9.pl | 2 +- test_regress/t/t_flag_getenv.pl | 2 +- test_regress/t/t_inst_overwide.pl | 2 +- test_regress/t/t_interface_modportlist.pl | 2 +- test_regress/t/t_lint_in_inc_bad.pl | 2 +- test_regress/t/t_pipe_filter.pl | 2 +- test_regress/t/t_preproc.pl | 2 +- test_regress/t/t_preproc_comments.pl | 2 +- test_regress/t/t_preproc_def09.pl | 2 +- test_regress/t/t_preproc_defines.pl | 2 +- test_regress/t/t_preproc_noline.pl | 2 +- test_regress/t/t_preproc_persist.pl | 2 +- test_regress/t/t_preproc_ttempty.pl | 2 +- test_regress/t/t_var_pins_cc.pl | 2 +- test_regress/t/t_xml_first.pl | 2 +- test_regress/t/t_xml_tag.pl | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/test_regress/driver.pl b/test_regress/driver.pl index f426fda71..391948790 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -581,7 +581,7 @@ sub new { "--comp-limit-members 10", ], verilator_flags2 => [], verilator_flags3 => ["--clk clk"], - verilator_make_gcc => 1, + verilator_make_gmake => 1, verilated_debug => $Opt_Verilated_Debug, stdout_filename => undef, # Redirect stdout %$self}; @@ -818,7 +818,7 @@ sub lint { make_main => 0, make_top_shell => 0, verilator_flags2 => ["--lint-only"], - verilator_make_gcc => 0, + verilator_make_gmake => 0, @_); $self->compile(%param); } @@ -977,7 +977,7 @@ sub compile { cmd=>\@cmdargs) if $::Opt_Verilation; return 1 if $self->errors || $self->skips || $self->unsupporteds; - if (!$param{fails} && $param{verilator_make_gcc}) { + if (!$param{fails} && $param{verilator_make_gmake}) { $self->oprint("GCC\n") if $self->{verbose}; $self->_run(logfile=>"$self->{obj_dir}/vlt_gcc.log", cmd=>["make", diff --git a/test_regress/t/t_a3_selftest.pl b/test_regress/t/t_a3_selftest.pl index a4290143b..284eb878a 100755 --- a/test_regress/t/t_a3_selftest.pl +++ b/test_regress/t/t_a3_selftest.pl @@ -13,7 +13,7 @@ top_filename("t/t_EXAMPLE.v"); compile( verilator_flags2 => ['--debug-self-test'], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, ); diff --git a/test_regress/t/t_cdc_async_bad.pl b/test_regress/t/t_cdc_async_bad.pl index b05f2cdc5..f32bced18 100755 --- a/test_regress/t/t_cdc_async_bad.pl +++ b/test_regress/t/t_cdc_async_bad.pl @@ -11,7 +11,7 @@ scenarios(vlt => 1); compile( v_flags => ['--cdc'], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, fails => 1, diff --git a/test_regress/t/t_dpi_import_hdr_only.pl b/test_regress/t/t_dpi_import_hdr_only.pl index d89c46dd8..5af4d0e18 100755 --- a/test_regress/t/t_dpi_import_hdr_only.pl +++ b/test_regress/t/t_dpi_import_hdr_only.pl @@ -18,7 +18,7 @@ my $tmp_dir = File::Temp->newdir(); compile( verilator_flags2 => ["-Wall -Wno-DECLFILENAME -Mdir " . $tmp_dir . " --dpi-hdr-only"], - verilator_make_gcc => 0, + verilator_make_gmake => 0, ); my @files = glob($tmp_dir . "/*"); @@ -31,7 +31,7 @@ die "Unexpected file $tmp_header" unless $tmp_header =~ /__Dpi\.h$/; compile( verilator_flags2 => ["-Wall -Wno-DECLFILENAME"], - verilator_make_gcc => 0, + verilator_make_gmake => 0, ); @files = glob($Self->obj_dir . "/*__Dpi.h"); diff --git a/test_regress/t/t_flag_csplit.pl b/test_regress/t/t_flag_csplit.pl index 202efd959..44103e503 100755 --- a/test_regress/t/t_flag_csplit.pl +++ b/test_regress/t/t_flag_csplit.pl @@ -20,7 +20,7 @@ while (1) { compile( v_flags2 => ["--trace --output-split 1 --output-split-cfuncs 1 --exe ../$Self->{main_filename}"], - verilator_make_gcc => 0, + verilator_make_gmake => 0, ); # We don't use the standard test_regress rules, as want to test the rules diff --git a/test_regress/t/t_flag_debug_noleak.pl b/test_regress/t/t_flag_debug_noleak.pl index 2cc5bffef..cdd1f209a 100755 --- a/test_regress/t/t_flag_debug_noleak.pl +++ b/test_regress/t/t_flag_debug_noleak.pl @@ -11,7 +11,7 @@ scenarios(vlt_all => 1); compile( v_flags2 => ["--debug --no-debug-leak"], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, ); diff --git a/test_regress/t/t_flag_debugi9.pl b/test_regress/t/t_flag_debugi9.pl index bb7e70e7c..cc772d533 100755 --- a/test_regress/t/t_flag_debugi9.pl +++ b/test_regress/t/t_flag_debugi9.pl @@ -12,7 +12,7 @@ scenarios(vlt_all => 1); compile( v_flags2 => ["--debug --debugi 9"], tee => 0, - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, ); diff --git a/test_regress/t/t_flag_getenv.pl b/test_regress/t/t_flag_getenv.pl index 7f8dbadbc..275affb39 100755 --- a/test_regress/t/t_flag_getenv.pl +++ b/test_regress/t/t_flag_getenv.pl @@ -16,7 +16,7 @@ compile( expect => 'gotit ', - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, ); diff --git a/test_regress/t/t_inst_overwide.pl b/test_regress/t/t_inst_overwide.pl index c47c13f1f..129fe6db7 100755 --- a/test_regress/t/t_inst_overwide.pl +++ b/test_regress/t/t_inst_overwide.pl @@ -11,7 +11,7 @@ scenarios(simulator => 1); compile( verilator_flags2 => [qw(-sc -Wno-WIDTH)], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, ); diff --git a/test_regress/t/t_interface_modportlist.pl b/test_regress/t/t_interface_modportlist.pl index 7053c9dd7..a02f58336 100755 --- a/test_regress/t/t_interface_modportlist.pl +++ b/test_regress/t/t_interface_modportlist.pl @@ -11,7 +11,7 @@ scenarios(simulator => 1); compile( fails => 0, - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, ); diff --git a/test_regress/t/t_lint_in_inc_bad.pl b/test_regress/t/t_lint_in_inc_bad.pl index 2ccfabd1d..f7eae9397 100755 --- a/test_regress/t/t_lint_in_inc_bad.pl +++ b/test_regress/t/t_lint_in_inc_bad.pl @@ -12,7 +12,7 @@ scenarios(vlt_all => 1); compile( v_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME --if-depth 10"], fails => 1, - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, expect_filename => $Self->{golden_filename}, diff --git a/test_regress/t/t_pipe_filter.pl b/test_regress/t/t_pipe_filter.pl index b8b07ffbc..026517e70 100755 --- a/test_regress/t/t_pipe_filter.pl +++ b/test_regress/t/t_pipe_filter.pl @@ -13,7 +13,7 @@ my $stdout_filename = "$Self->{obj_dir}/$Self->{name}__test.vpp"; compile( verilator_flags2 => ['-E --pipe-filter \'perl t/t_pipe_filter.pf\' '], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, stdout_filename => $stdout_filename, diff --git a/test_regress/t/t_preproc.pl b/test_regress/t/t_preproc.pl index d0525f7ff..7fab97211 100755 --- a/test_regress/t/t_preproc.pl +++ b/test_regress/t/t_preproc.pl @@ -13,7 +13,7 @@ my $stdout_filename = "$Self->{obj_dir}/$Self->{name}__test.vpp"; compile( verilator_flags2 => ['-DDEF_A0 -DPREDEF_COMMAND_LINE -E'], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, stdout_filename => $stdout_filename, diff --git a/test_regress/t/t_preproc_comments.pl b/test_regress/t/t_preproc_comments.pl index 3673fe720..76a564caf 100755 --- a/test_regress/t/t_preproc_comments.pl +++ b/test_regress/t/t_preproc_comments.pl @@ -15,7 +15,7 @@ my $stdout_filename = "$Self->{obj_dir}/$Self->{name}__test.vpp"; compile( verilator_flags2 => ['-DDEF_A0 -DPREDEF_COMMAND_LINE -E --pp-comments'], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, stdout_filename => $stdout_filename, diff --git a/test_regress/t/t_preproc_def09.pl b/test_regress/t/t_preproc_def09.pl index ecb86adf2..841fbc144 100755 --- a/test_regress/t/t_preproc_def09.pl +++ b/test_regress/t/t_preproc_def09.pl @@ -13,7 +13,7 @@ my $stdout_filename = "$Self->{obj_dir}/$Self->{name}__test.vpp"; compile( verilator_flags2 => ['-E'], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, stdout_filename => $stdout_filename, diff --git a/test_regress/t/t_preproc_defines.pl b/test_regress/t/t_preproc_defines.pl index 947c5992b..175d16f15 100755 --- a/test_regress/t/t_preproc_defines.pl +++ b/test_regress/t/t_preproc_defines.pl @@ -15,7 +15,7 @@ my $stdout_filename = "$Self->{obj_dir}/$Self->{name}__test.vpp"; compile( verilator_flags2 => ['-DDEF_A0 -DPREDEF_COMMAND_LINE -E --dump-defines'], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, stdout_filename => $stdout_filename, diff --git a/test_regress/t/t_preproc_noline.pl b/test_regress/t/t_preproc_noline.pl index 5272f1429..e85ef091f 100755 --- a/test_regress/t/t_preproc_noline.pl +++ b/test_regress/t/t_preproc_noline.pl @@ -15,7 +15,7 @@ top_filename("t/t_preproc_noline.v"); compile( verilator_flags2 => ['-E -P'], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, stdout_filename => $stdout_filename, diff --git a/test_regress/t/t_preproc_persist.pl b/test_regress/t/t_preproc_persist.pl index 9b1ed0bf6..0cf8c2a41 100755 --- a/test_regress/t/t_preproc_persist.pl +++ b/test_regress/t/t_preproc_persist.pl @@ -18,7 +18,7 @@ compile( verilator_flags => ["-E -P +incdir+t -Mdir $Self->{obj_dir}", ], verilator_flags2 => ['',], verilator_flags3 => ['',], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, stdout_filename => $stdout_filename, diff --git a/test_regress/t/t_preproc_ttempty.pl b/test_regress/t/t_preproc_ttempty.pl index 9ba0d307f..f54f0332d 100755 --- a/test_regress/t/t_preproc_ttempty.pl +++ b/test_regress/t/t_preproc_ttempty.pl @@ -17,7 +17,7 @@ compile( verilator_flags => ["-E -P +incdir+t -Mdir $Self->{obj_dir}", ], verilator_flags2 => ['',], verilator_flags3 => ['',], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, stdout_filename => $stdout_filename, diff --git a/test_regress/t/t_var_pins_cc.pl b/test_regress/t/t_var_pins_cc.pl index 27b91183f..d5c23f443 100755 --- a/test_regress/t/t_var_pins_cc.pl +++ b/test_regress/t/t_var_pins_cc.pl @@ -13,7 +13,7 @@ top_filename("t/t_var_pinsizes.v"); compile( verilator_flags2 => ['-cc'], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, ); diff --git a/test_regress/t/t_xml_first.pl b/test_regress/t/t_xml_first.pl index 12cd50808..5f8089cdd 100755 --- a/test_regress/t/t_xml_first.pl +++ b/test_regress/t/t_xml_first.pl @@ -13,7 +13,7 @@ my $out_filename = "$Self->{obj_dir}/V$Self->{name}.xml"; compile( verilator_flags2 => ['--xml-only'], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, ); diff --git a/test_regress/t/t_xml_tag.pl b/test_regress/t/t_xml_tag.pl index 12cd50808..5f8089cdd 100755 --- a/test_regress/t/t_xml_tag.pl +++ b/test_regress/t/t_xml_tag.pl @@ -13,7 +13,7 @@ my $out_filename = "$Self->{obj_dir}/V$Self->{name}.xml"; compile( verilator_flags2 => ['--xml-only'], - verilator_make_gcc => 0, + verilator_make_gmake => 0, make_top_shell => 0, make_main => 0, );