Tests: Fix tests, broke in commit 3a9eeabd

This commit is contained in:
Wilson Snyder 2023-06-12 21:36:23 -04:00
parent 66c3d6d2d1
commit d42f76c346
1 changed files with 8 additions and 6 deletions

View File

@ -921,16 +921,18 @@ sub compile_vlt_flags {
my %param = (%{$self}, @_); # Default arguments are from $self my %param = (%{$self}, @_); # Default arguments are from $self
return 1 if $self->errors || $self->skips; return 1 if $self->errors || $self->skips;
my $checkflags = ' '.join(' ', @{$param{v_flags}}, my $checkflags = (' '.join(' ',
@{$param{v_flags2}}, @{$param{v_flags}},
@{$param{verilator_flags}}, @{$param{v_flags2}},
@{$param{verilator_flags2}}, @{$param{verilator_flags}},
@{$param{verilator_flags3}}); @{$param{verilator_flags2}},
@{$param{verilator_flags3}})
.' ');
die "%Error: specify threads via 'threads =>' argument, not as a command line option" unless ($checkflags !~ /(^|\s)-?-threads\s/); die "%Error: specify threads via 'threads =>' argument, not as a command line option" unless ($checkflags !~ /(^|\s)-?-threads\s/);
$self->{coverage} = 1 if ($checkflags =~ /-coverage\b/); $self->{coverage} = 1 if ($checkflags =~ /-coverage\b/);
$self->{savable} = 1 if ($checkflags =~ /-savable\b/); $self->{savable} = 1 if ($checkflags =~ /-savable\b/);
$self->{sc} = 1 if ($checkflags =~ /-sc\b/); $self->{sc} = 1 if ($checkflags =~ /-sc\b/);
$self->{timing} = 1 if ($checkflags =~ /\b-?-timing\b/ || $checkflags =~ /\b-?-binary\b/ ); $self->{timing} = 1 if ($checkflags =~ / -?-timing\b/ || $checkflags =~ / -?-binary\b/ );
$self->{trace} = ($opt_trace || $checkflags =~ /-trace\b/ $self->{trace} = ($opt_trace || $checkflags =~ /-trace\b/
|| $checkflags =~ /-trace-fst\b/); || $checkflags =~ /-trace-fst\b/);
$self->{trace_format} = (($checkflags =~ /-trace-fst/ && $self->{sc} && 'fst-sc') $self->{trace_format} = (($checkflags =~ /-trace-fst/ && $self->{sc} && 'fst-sc')