Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

Tests: Clean before rerunning failing test.

Browse Source
This commit is contained in:
Wilson Snyder 2020-04-11 11:40:15 -04:00
parent 8b2666cd04
commit 8e6674066f
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test_regress/driver.pl
View File

@ -192,11 +192,7 @@ if ($opt_rerun && $runner->fail_count) {
skip_cnt => $orig_runner->{skip_cnt}, skip_cnt => $orig_runner->{skip_cnt},
unsup_cnt => $orig_runner->{unsup_cnt}); unsup_cnt => $orig_runner->{unsup_cnt});
foreach my $test (@{$orig_runner->{fail_tests}}) { foreach my $test (@{$orig_runner->{fail_tests}}) {
if (0) { # TBD if this is required - rare that intermediate results are bad $test->clean;
# Remove old results to force hard rebuild
system("rm", "-rf", "$test->{obj_dir}__fail1");
system("mv", "$test->{obj_dir}", "$test->{obj_dir}__fail1");
}
# Reschedule test # Reschedule test
$runner->one_test(pl_filename => $test->{pl_filename}, $runner->one_test(pl_filename => $test->{pl_filename},
$test->{scenario} => 1); $test->{scenario} => 1);
@ -795,6 +791,20 @@ sub _read_status {
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Methods invoked by tests # Methods invoked by tests
sub clean {
my $self = (ref $_[0] ? shift : $Self);
# Called on a rerun to cleanup files
if ($self->{clean_command}) {
system($self->{clean_command});
}
if (1) {
# Prevents false-failures when switching compilers
# Remove old results to force hard rebuild
system("rm", "-rf", "$self->{obj_dir}__fail1");
system("mv", "$self->{obj_dir}", "$self->{obj_dir}__fail1");
}
}
sub compile_vlt_cmd { sub compile_vlt_cmd {
my $self = (ref $_[0]? shift : $Self); my $self = (ref $_[0]? shift : $Self);
my %param = (%{$self}, @_); # Default arguments are from $self my %param = (%{$self}, @_); # Default arguments are from $self

2
test_regress/t/t_a4_examples.pl
View File

@ -10,6 +10,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(dist => 1); scenarios(dist => 1);
$Self->{clean_command} = 'rm -rf ../examples/*/build ../examples/*/obj*';
my @examples = sort(glob("../examples/*")); my @examples = sort(glob("../examples/*"));
for my $example (@examples) { for my $example (@examples) {
run(cmd=>["make -C $example"]); run(cmd=>["make -C $example"]);