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

Fix Ubuntu 16.04 test failures.

This commit is contained in:
Wilson Snyder 2016-07-12 21:43:16 -04:00
parent 31c9e26e2e
commit be1d275151
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test_regress/t/t_pipe_exit_bad.pl
View File

@ -17,9 +17,7 @@ compile (
stdout_filename => $stdout_filename, stdout_filename => $stdout_filename,
fails=>1, fails=>1,
expect=> expect=>
'%Error: t_pipe_exit_bad.pf: Intentional bad exit status... '%Error: t_pipe_exit_bad.pf: Intentional bad exit status....*',
%Error: File not found: t/t_pipe_filter.v
%Error: Exiting due to.*',
); );
ok(1); ok(1);

6
test_regress/t/t_tri_select.cpp
View File

@ -16,9 +16,9 @@ bool check() {
bool verbose = false; bool verbose = false;
#endif #endif
int Y = (tb->OE1 & !tb->OE2) ? tb->A1 int Y = ((tb->OE1) & (!tb->OE2)) ? tb->A1
: (!tb->OE1 & tb->OE2) ? tb->A2 : ((!tb->OE1) & (tb->OE2)) ? tb->A2
: (tb->OE1 & tb->OE2) ? (tb->A1 | tb->A2) : ((tb->OE1) & (tb->OE2)) ? (tb->A1 | tb->A2)
: 3; // pullup : 3; // pullup
int W = (((tb->OE2) ? (tb->A2 & 0x1) : 0) << tb->A1) int W = (((tb->OE2) ? (tb->A2 & 0x1) : 0) << tb->A1)

14
test_verilated/vgen.pl
View File

@ -377,17 +377,15 @@ sub rnd_const {
my $val = Bit::Vector->new($width); my $val = Bit::Vector->new($width);
if ($v<25) { # zero if ($v<25) { # zero
} elsif ($v<50) { # ones } elsif ($v<50) { # ones
$val->Word_Store(0,~0); for (my $w=0; $w<$val->Word_Size; ++$w) {
$val->Word_Store(1,~0) if $width>32; $val->Word_Store(0,~0);
$val->Word_Store(2,~0) if $width>64; }
$val->Word_Store(3,~0) if $width>96;
} elsif ($v<60) { # one } elsif ($v<60) { # one
$val->Word_Store(0,1); $val->Word_Store(0,1);
} else { #random } else { #random
$val->Word_Store(0,rnd_int()); for (my $w=0; $w<$val->Word_Size; ++$w) {
$val->Word_Store(1,rnd_int()) if $width>32; $val->Word_Store($w,rnd_int());
$val->Word_Store(2,rnd_int()) if $width>64; }
$val->Word_Store(3,rnd_int()) if $width>96;
} }
$treeref->{val} = $val; $treeref->{val} = $val;
} }