luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tests: Add rerunnable(0)

This commit is contained in:
Wilson Snyder 2022-12-02 19:57:40 -05:00
parent 0809c17ce1
commit 675cc891a5
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test_regress/driver.pl
View File

@ -197,10 +197,11 @@ if ($opt_rerun && $runner->fail_count) {
ok_cnt => $orig_runner->{ok_cnt},
skip_cnt => $orig_runner->{skip_cnt});
foreach my $test (@{$orig_runner->{fail_tests}}) {
$test->clean;
# Reschedule test
$test->clean if $test->rerunnable;
$runner->one_test(pl_filename => $test->{pl_filename},
$test->{scenario} => 1);
$test->{scenario} => 1,
rerun_skipping => !$test->rerunnable);
}
$runner->wait_and_report;
}
@ -350,9 +351,15 @@ sub one_test {
my $test = VTest->new(@params,
running_id => $process->{running_id});
$test->oprint("=" x 50, "\n");
unlink $test->{status_filename};
unlink $test->{status_filename} if !$params{rerun_skipping};
$test->_prep;
$test->_read;
if ($params{rerun_skipping}) {
print " ---------- Earlier logfiles below; test was rerunnable = 0\n";
system("cat $test->{obj_dir}/*.log");
print " ---------- Earlier logfiles above; test was rerunnable = 0\n";
} else {
$test->_read;
}
# Don't put anything other than _exit after _read,
# as may call _exit via another path
$test->_exit;
@ -575,6 +582,7 @@ sub new {
context_threads => 0, # Number of threads to allocate in the context
benchmark => $opt_benchmark,
verbose => $opt_verbose,
rerunnable => 1, # Rerun if fails
run_env => '',
# All compilers
v_flags => [split(/\s+/,
@ -1515,6 +1523,12 @@ sub pli_filename {
return $self->{pli_filename};
}
sub rerunnable {
my $self = (ref $_[0] ? shift : $Self);
$self->{rerunnable} = shift if defined $_[0];
return $self->{rerunnable};
}
sub too_few_cores {
my $threads = ::calc_threads($Vltmt_threads);
return $threads < $Vltmt_threads;
@ -2488,7 +2502,7 @@ sub file_contents {
my $fh = IO::File->new("<$filename");
if (!$fh) {
$_File_Contents_Cache{$filename} = "_Already_Errored_";
$self->error("File_grep file not found: " . $filename . "\n");
$self->error("File_contents file not found: " . $filename . "\n");
return $_File_Contents_Cache{$filename};
}
local $/; undef $/;