github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-01 04:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test failures on Ubuntu 20.04 (#2278)

Browse Source 
- Packaged SystemC lives in /usr so needed to update regex in test
driver
- Clang 10 complains about mixed named and positional initializers in
struct definitions.
This commit is contained in:
Geza Lore 2020-04-23 22:29:37 +01:00 committed by GitHub
parent ace35b3e81
commit 8208fe8a0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test_regress/driver.pl
View File

@ -2015,7 +2015,7 @@ sub files_identical {
&& !/^- [a-z.0-9]+:\d+:[^\n]+\n/
&& !/^-node:/
&& !/^dot [^\n]+\n/
&& !/^In file: \/.*\/systemc-\d\.\d\.\d\/.*:\d+/
&& !/^In file: .*\/sc_.*:\d+/
} @l1;
@l1 = map {
s/(Internal Error: [^\n]+\.cpp):[0-9]+:/$1:#:/;

2
test_regress/t/t_vpi_get.cpp
View File

@ -82,7 +82,7 @@ unsigned int main_time = 0;
#define CHECK_RESULT_CSTR_STRIP(got, exp) CHECK_RESULT_CSTR(got + strspn(got, " "), exp)
static int _mon_check_props(TestVpiHandle& handle, int size, int direction, int scalar, int type) {
s_vpi_value value = {vpiIntVal, .value = {.integer = 0}};
s_vpi_value value = {.format = vpiIntVal, .value = {.integer = 0}};
// check size of object
int vpisize = vpi_get(vpiSize, handle);
CHECK_RESULT(vpisize, size);

4
test_regress/t/t_vpi_memory.cpp
View File

@ -83,7 +83,7 @@ unsigned int main_time = 0;
int _mon_check_range(TestVpiHandle& handle, int size, int left, int right) {
TestVpiHandle iter_h, left_h, right_h;
s_vpi_value value = {vpiIntVal, .value = {.integer = 0}};
s_vpi_value value = {.format = vpiIntVal, .value = {.integer = 0}};
// check size of object
int vpisize = vpi_get(vpiSize, handle);
CHECK_RESULT(vpisize, size);
@ -112,7 +112,7 @@ int _mon_check_memory() {
int cnt;
TestVpiHandle mem_h, lcl_h;
vpiHandle iter_h; // Icarus does not like auto free of iterator handles
s_vpi_value value = {vpiIntVal, .value = {.integer = 0}};
s_vpi_value value = {.format = vpiIntVal, .value = {.integer = 0}};
vpi_printf((PLI_BYTE8*)"Check memory vpi ...\n");
mem_h = vpi_handle_by_name((PLI_BYTE8*)TestSimulator::rooted("mem0"), NULL);
CHECK_RESULT_NZ(mem_h);