From 0af3efda5c09e27bf364d021de777ab3df569932 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sat, 19 Nov 2022 17:09:43 -0500 Subject: [PATCH] Tests: Fix top_filename to properly test (#3767) --- test_regress/t/t_mailbox_std.out | 17 ++++++----------- test_regress/t/t_mailbox_std.pl | 2 +- test_regress/t/t_process_std.out | 19 +++++++++---------- test_regress/t/t_process_std.pl | 2 +- test_regress/t/t_semaphore_std.out | 16 ++++++---------- test_regress/t/t_semaphore_std.pl | 2 +- 6 files changed, 24 insertions(+), 34 deletions(-) diff --git a/test_regress/t/t_mailbox_std.out b/test_regress/t/t_mailbox_std.out index d9c517f02..d09756948 100644 --- a/test_regress/t/t_mailbox_std.out +++ b/test_regress/t/t_mailbox_std.out @@ -1,11 +1,6 @@ -%Error: t/t_mailbox.pl:1:1: syntax error, unexpected '#' - 1 | #!/usr/bin/env perl - | ^ -%Error-UNSUPPORTED: t/t_mailbox.pl:2:19: Unsupported: Verilog 2001-config reserved word not implemented: 'use' - 2 | if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; } - | ^~~ - ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest -%Error-UNSUPPORTED: t/t_mailbox.pl:3:47: Unsupported: SystemVerilog 2005 reserved word not implemented: 'expect' - 3 | # DESCRIPTION: Verilator: Verilog Test driver/expect definition - | ^~~~~~ -%Error: Exiting due to +%Error: t/t_mailbox.v:24:4: Can't find typedef: 'mailbox' + 24 | mailbox #(int) m; + | ^~~~~~~ +%Error: Internal Error: t/t_mailbox.v:24:14: ../V3LinkDot.cpp:#: Pin not under instance? + 24 | mailbox #(int) m; + | ^~~ diff --git a/test_regress/t/t_mailbox_std.pl b/test_regress/t/t_mailbox_std.pl index 207b5f005..3b640c6e1 100755 --- a/test_regress/t/t_mailbox_std.pl +++ b/test_regress/t/t_mailbox_std.pl @@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); -top_filename("t/t_mailbox.pl"); +top_filename("t/t_mailbox.v"); compile( v_flags2 => ["+define+T_MAILBOX+std::mailbox"], diff --git a/test_regress/t/t_process_std.out b/test_regress/t/t_process_std.out index 80b26b03c..a4ada3778 100644 --- a/test_regress/t/t_process_std.out +++ b/test_regress/t/t_process_std.out @@ -1,11 +1,10 @@ -%Error: t/t_process.pl:1:1: syntax error, unexpected '#' - 1 | #!/usr/bin/env perl - | ^ -%Error-UNSUPPORTED: t/t_process.pl:2:19: Unsupported: Verilog 2001-config reserved word not implemented: 'use' - 2 | if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; } - | ^~~ +%Error: t/t_process.v:22:4: Can't find typedef: 'process' + 22 | process p; + | ^~~~~~~ +%Error-UNSUPPORTED: t/t_process.v:26:20: Unsupported: 'process' + 26 | p = process::self(); + | ^~~~ ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest -%Error-UNSUPPORTED: t/t_process.pl:3:47: Unsupported: SystemVerilog 2005 reserved word not implemented: 'expect' - 3 | # DESCRIPTION: Verilator: Verilog Test driver/expect definition - | ^~~~~~ -%Error: Exiting due to +%Error: Internal Error: t/t_process.v:26:11: ../V3LinkDot.cpp:#: Bad package link + 26 | p = process::self(); + | ^~~~~~~ diff --git a/test_regress/t/t_process_std.pl b/test_regress/t/t_process_std.pl index 462019b41..0c23347b2 100755 --- a/test_regress/t/t_process_std.pl +++ b/test_regress/t/t_process_std.pl @@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); -top_filename("t/t_process.pl"); +top_filename("t/t_process.v"); compile( v_flags2 => ["+define+T_PROCESS+std::process"], diff --git a/test_regress/t/t_semaphore_std.out b/test_regress/t/t_semaphore_std.out index 884a7159b..95ce89973 100644 --- a/test_regress/t/t_semaphore_std.out +++ b/test_regress/t/t_semaphore_std.out @@ -1,11 +1,7 @@ -%Error: t/t_semaphore.pl:1:1: syntax error, unexpected '#' - 1 | #!/usr/bin/env perl - | ^ -%Error-UNSUPPORTED: t/t_semaphore.pl:2:19: Unsupported: Verilog 2001-config reserved word not implemented: 'use' - 2 | if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; } - | ^~~ - ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest -%Error-UNSUPPORTED: t/t_semaphore.pl:3:47: Unsupported: SystemVerilog 2005 reserved word not implemented: 'expect' - 3 | # DESCRIPTION: Verilator: Verilog Test driver/expect definition - | ^~~~~~ +%Error: t/t_semaphore.v:21:4: Can't find typedef: 'semaphore' + 21 | semaphore s; + | ^~~~~~~~~ +%Error: t/t_semaphore.v:22:4: Can't find typedef: 'semaphore' + 22 | semaphore s2; + | ^~~~~~~~~ %Error: Exiting due to diff --git a/test_regress/t/t_semaphore_std.pl b/test_regress/t/t_semaphore_std.pl index b6c87f81b..ece82f871 100755 --- a/test_regress/t/t_semaphore_std.pl +++ b/test_regress/t/t_semaphore_std.pl @@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); -top_filename("t/t_semaphore.pl"); +top_filename("t/t_semaphore.v"); compile( v_flags2 => ["+define+T_SEMAPHORE+std::semaphore"],