github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 20:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Call driver's run instead of private _run.

Browse Source
This commit is contained in:
Wilson Snyder 2017-09-23 08:50:39 -04:00
parent 3f14e649b5
commit 16234bb713
11 changed files with 75 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test_regress/driver.pl
View File

@ -908,6 +908,10 @@ sub sc {
#---------------------------------------------------------------------- #----------------------------------------------------------------------
sub run {
my $self = (ref $_[0]? shift : $Self);
$self->_run(@_);
}
sub _run { sub _run {
my $self = (ref $_[0]? shift : $Self); my $self = (ref $_[0]? shift : $Self);
my %param = (tee=>1, my %param = (tee=>1,

2
test_regress/t/t_assert_cover.pl
View File

@ -28,7 +28,7 @@ if ($Self->{nc}) {
$fh->printf("report_html -both -instance * > $Self->{obj_dir}/${name}__nccover.html\n"); $fh->printf("report_html -both -instance * > $Self->{obj_dir}/${name}__nccover.html\n");
$fh->close; $fh->close;
} }
$Self->_run (logfile=>"$Self->{obj_dir}/${name}__nccover.log", $Self->run(logfile=>"$Self->{obj_dir}/${name}__nccover.log",
tee=>0, tee=>0,
cmd=>[($ENV{VERILATOR_ICCR}||'iccr'), cmd=>[($ENV{VERILATOR_ICCR}||'iccr'),
"-test ${name} ${cf}"]); "-test ${name} ${cf}"]);

4
test_regress/t/t_case_huge_prof.pl
View File

@ -32,10 +32,10 @@ $gmon_path = $_ foreach (glob "$Self->{obj_dir}/gmon.out.*");
$gmon_path or $Self->error("Profiler did not create a gmon.out"); $gmon_path or $Self->error("Profiler did not create a gmon.out");
(my $gmon_base = $gmon_path) =~ s!.*[/\\]!!; (my $gmon_base = $gmon_path) =~ s!.*[/\\]!!;
$Self->_run(cmd=>["cd $Self->{obj_dir} && gprof $Self->{VM_PREFIX} $gmon_base > gprof.out"], $Self->run(cmd=>["cd $Self->{obj_dir} && gprof $Self->{VM_PREFIX} $gmon_base > gprof.out"],
check_finished=>0); check_finished=>0);
$Self->_run(cmd=>["cd $Self->{obj_dir} && $ENV{VERILATOR_ROOT}/bin/verilator_profcfunc gprof.out > cfuncs.out"], $Self->run(cmd=>["cd $Self->{obj_dir} && $ENV{VERILATOR_ROOT}/bin/verilator_profcfunc gprof.out > cfuncs.out"],
check_finished=>0); check_finished=>0);
file_grep ("$Self->{obj_dir}/cfuncs.out", qr/Overall summary by/); file_grep ("$Self->{obj_dir}/cfuncs.out", qr/Overall summary by/);

2
test_regress/t/t_cover_line_cc.pl
View File

@ -20,7 +20,7 @@ execute (
# Read the input .v file and do any CHECK_COVER requests # Read the input .v file and do any CHECK_COVER requests
inline_checks(); inline_checks();
$Self->_run(cmd=>["../bin/verilator_coverage", $Self->run(cmd=>["../bin/verilator_coverage",
"--annotate", "$Self->{obj_dir}/annotated", "--annotate", "$Self->{obj_dir}/annotated",
"$Self->{obj_dir}/coverage.dat", "$Self->{obj_dir}/coverage.dat",
], ],

6
test_regress/t/t_dist_install.pl
View File

@ -18,11 +18,11 @@ if (!-r "$root/.git") {
my $cwd = getcwd(); my $cwd = getcwd();
my $destdir = "$cwd/".$Self->{obj_dir}; my $destdir = "$cwd/".$Self->{obj_dir};
# Start clean # Start clean
$Self->_run(cmd=>["rm -rf $destdir && mkdir -p $destdir"], $Self->run(cmd=>["rm -rf $destdir && mkdir -p $destdir"],
check_finished=>0); check_finished=>0);
# Install into temp area # Install into temp area
print "Install...\n"; print "Install...\n";
$Self->_run (cmd=>["cd $root && make DESTDIR=$destdir install-all"], $Self->run(cmd=>["cd $root && make DESTDIR=$destdir install-all"],
check_finished=>0); check_finished=>0);
# Check we can run a test # Check we can run a test
@ -32,7 +32,7 @@ if (!-r "$root/.git") {
# Uninstall # Uninstall
print "Uninstall...\n"; print "Uninstall...\n";
$Self->_run (cmd=>["cd $root && make DESTDIR=$destdir uninstall"], $Self->run(cmd=>["cd $root && make DESTDIR=$destdir uninstall"],
check_finished=>0); check_finished=>0);
# Check empty # Check empty

4
test_regress/t/t_embed1.pl
View File

@ -21,10 +21,10 @@ mkdir $child_dir;
verilator_flags => ["-cc", "-Mdir", "${child_dir}", "--debug-check"], verilator_flags => ["-cc", "-Mdir", "${child_dir}", "--debug-check"],
); );
$Self->_run(logfile=>"${child_dir}/vlt_compile.log", $Self->run(logfile=>"${child_dir}/vlt_compile.log",
cmd=>\@cmdargs); cmd=>\@cmdargs);
$Self->_run(logfile=>"${child_dir}/vlt_gcc.log", $Self->run(logfile=>"${child_dir}/vlt_gcc.log",
cmd=>["cd ${child_dir} && ", cmd=>["cd ${child_dir} && ",
"make", "-f".getcwd()."/Makefile_obj", "make", "-f".getcwd()."/Makefile_obj",
"CPPFLAGS_DRIVER=-D".uc($self->{name}), "CPPFLAGS_DRIVER=-D".uc($self->{name}),

4
test_regress/t/t_flag_ldflags.pl
View File

@ -9,12 +9,12 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
$Self->{vlt} or $Self->skip("Verilator only test"); $Self->{vlt} or $Self->skip("Verilator only test");
$Self->_run (cmd=>["cd $Self->{obj_dir}" $Self->run(cmd=>["cd $Self->{obj_dir}"
." && c++ -c ../../t/t_flag_ldflags_a.cpp" ." && c++ -c ../../t/t_flag_ldflags_a.cpp"
." && ar r t_flag_ldflags_a.a t_flag_ldflags_a.o" ." && ar r t_flag_ldflags_a.a t_flag_ldflags_a.o"
." && ranlib t_flag_ldflags_a.a "], ." && ranlib t_flag_ldflags_a.a "],
check_finished=>0); check_finished=>0);
$Self->_run (cmd=>["cd $Self->{obj_dir}" $Self->run(cmd=>["cd $Self->{obj_dir}"
." && c++ -fPIC -c ../../t/t_flag_ldflags_so.cpp" ." && c++ -fPIC -c ../../t/t_flag_ldflags_so.cpp"
." && c++ -shared -o t_flag_ldflags_so.so -lc t_flag_ldflags_so.o"], ." && c++ -shared -o t_flag_ldflags_so.so -lc t_flag_ldflags_so.o"],
check_finished=>0); check_finished=>0);

2
test_regress/t/t_help.pl
View File

@ -15,7 +15,7 @@ foreach my $prog (
"../bin/verilator_difftree", "../bin/verilator_difftree",
"../bin/verilator_profcfunc", "../bin/verilator_profcfunc",
) { ) {
$Self->_run(fails=>1, $Self->run(fails=>1,
cmd=>["perl",$prog, cmd=>["perl",$prog,
"--help"], "--help"],
logfile=>"$Self->{obj_dir}/t_help.log", logfile=>"$Self->{obj_dir}/t_help.log",

2
test_regress/t/t_vlcov_merge.pl
View File

@ -9,7 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
$Self->{vlt} or $Self->skip("Verilator only test"); $Self->{vlt} or $Self->skip("Verilator only test");
$Self->_run(cmd=>["../bin/verilator_coverage", $Self->run(cmd=>["../bin/verilator_coverage",
"--write", "$Self->{obj_dir}/coverage.dat", "--write", "$Self->{obj_dir}/coverage.dat",
"t/t_vlcov_data_a.dat", "t/t_vlcov_data_a.dat",
"t/t_vlcov_data_b.dat", "t/t_vlcov_data_b.dat",

2
test_regress/t/t_vlcov_rank.pl
View File

@ -9,7 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
$Self->{vlt} or $Self->skip("Verilator only test"); $Self->{vlt} or $Self->skip("Verilator only test");
$Self->_run(cmd=>["../bin/verilator_coverage", $Self->run(cmd=>["../bin/verilator_coverage",
"--rank", "--rank",
"t/t_vlcov_data_a.dat", "t/t_vlcov_data_a.dat",
"t/t_vlcov_data_b.dat", "t/t_vlcov_data_b.dat",

2
test_regress/t/t_vlcov_rewrite.pl
View File

@ -14,7 +14,7 @@ foreach my $basename ("t_vlcov_data_a.dat",
"t_vlcov_data_c.dat", "t_vlcov_data_c.dat",
"t_vlcov_data_d.dat", "t_vlcov_data_d.dat",
) { ) {
$Self->_run(cmd=>["../bin/verilator_coverage", $Self->run(cmd=>["../bin/verilator_coverage",
"t/${basename}", "t/${basename}",
"--write", "$Self->{obj_dir}/${basename}" "--write", "$Self->{obj_dir}/${basename}"
], ],