diff --git a/Makefile.in b/Makefile.in index d6b8f207b..37fad3cc9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -111,7 +111,7 @@ DISTFILES_INC = $(INFOS) .gitignore COPYING *.in *.ac \ include/.*ignore \ .*attributes */.*attributes */*/.*attributes \ src/.*ignore src/*.in src/*.cpp src/*.[chly] src/astgen src/bisonpre src/*fix \ - src/*.pl \ + src/*.pl src/*.pod \ test_*/.*ignore test_*/Makefile* test_*/*.cpp \ test_*/*.pl test_*/*.v test_*/*.vc test_*/vlint \ test_verilated/vgen*.pl \ diff --git a/bin/verilator b/bin/verilator index 2d8183b8a..d466bb6d6 100755 --- a/bin/verilator +++ b/bin/verilator @@ -2034,9 +2034,9 @@ Visual C++ Version 7 or newer, but this is not tested by the author. =item Can you provide binaries? -Verilator is available as a RPM for SuSE and perhaps other systems; this is -done by porters and may slightly lag the primary distribution. If there -isn't a binary build for your distribution, how about you set one up? +Verilator is available as a RPM for SuSE, Redhat and perhaps other systems; +this is done by porters and may slightly lag the primary distribution. If +there isn't a binary build for your distribution, how about you set one up? Please contact the authors for assistance. Note people sometimes request binaries when they are having problems with diff --git a/test_regress/t/t_assert_cover.pl b/test_regress/t/t_assert_cover.pl index 78c806e02..085adda20 100755 --- a/test_regress/t/t_assert_cover.pl +++ b/test_regress/t/t_assert_cover.pl @@ -23,8 +23,8 @@ if ($Last_Self->{nc}) { { my $fh = IO::File->new(">$cf") or die "%Error: $! writing $cf,"; $fh->printf("report_summary -module *\n"); - $fh->printf("report_detail -both -module *\n"); - $fh->printf("report_html -both -module * > obj_dir/${name}__nccover.html\n"); + $fh->printf("report_detail -both -instance *\n"); + $fh->printf("report_html -both -instance * > obj_dir/${name}__nccover.html\n"); $fh->close; } $Last_Self->_run (logfile=>"obj_dir/${name}__nccover.log", @@ -36,7 +36,9 @@ if ($Last_Self->{nc}) { file_grep ("obj_dir/$Last_Self->{name}_simx.log", qr/COVER: Cyc==4/); file_grep ("obj_dir/$Last_Self->{name}_simx.log", qr/COVER: Cyc==5/); file_grep ("obj_dir/$Last_Self->{name}_simx.log", qr/COVER: Cyc==6/); -file_grep ($Last_Self->{coverage_filename}, qr/cyc_eq_5.*,c=>[^0]/); + +# Allow old Perl format dump, or new binary dump +file_grep ($Last_Self->{coverage_filename}, qr/(cyc_eq_5.*,c=>[^0]|cyc_eq_5.* [1-9][0-9]*\n)/); ok(1); 1; diff --git a/test_regress/t/t_psl_basic_cover.pl b/test_regress/t/t_psl_basic_cover.pl index 79c13f1eb..020609993 100755 --- a/test_regress/t/t_psl_basic_cover.pl +++ b/test_regress/t/t_psl_basic_cover.pl @@ -16,9 +16,10 @@ execute ( check_finished=>1, ); -file_grep ($Last_Self->{coverage_filename}, qr/,o=>'cover'.*,c=>2\);/); -file_grep ($Last_Self->{coverage_filename}, qr/DefaultClock.*,c=>1\);/); -file_grep ($Last_Self->{coverage_filename}, qr/ToggleLogIf.*,c=>9\);/); +# Allow old Perl format dump, or new binary dump +file_grep ($Last_Self->{coverage_filename}, qr/(,o=>'cover'.*,c=>2\)|o.cover.* 2\n)/); +file_grep ($Last_Self->{coverage_filename}, qr/(DefaultClock.*,c=>1\)|DefaultClock.* 1\n)/); +file_grep ($Last_Self->{coverage_filename}, qr/(ToggleLogIf.*,c=>9\)|ToggleLogIf.* 9\n)/); ok(1); 1; diff --git a/test_sc/Makefile b/test_sc/Makefile index 7a0affa48..c8c53c1bc 100644 --- a/test_sc/Makefile +++ b/test_sc/Makefile @@ -31,7 +31,7 @@ VERILATOR_FLAGS = --sc $(V_FLAGS) top.v precopy: obj_dir obj_dir/sc_main.cpp obj_dir/sc_main.cpp: ../test_sp/sc_main.cpp - mkdir obj_dir + mkdir -p obj_dir cp $^ $@ prep: