From d33a3d09f7bf2548e7b122198fb492e9d419a05e Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Sat, 22 Oct 2022 14:35:36 -0400
Subject: [PATCH] Tests: Fix bison-dependent .out

---
 test_regress/t/t_dist_warn_coverage.pl | 6 ++++--
 test_regress/t/t_udp_tableeof_bad.out  | 3 ---
 test_regress/t/t_udp_tableeof_bad.pl   | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 test_regress/t/t_udp_tableeof_bad.out

diff --git a/test_regress/t/t_dist_warn_coverage.pl b/test_regress/t/t_dist_warn_coverage.pl
index 4eb63cc6b..09231ecb7 100755
--- a/test_regress/t/t_dist_warn_coverage.pl
+++ b/test_regress/t/t_dist_warn_coverage.pl
@@ -99,7 +99,6 @@ foreach my $s (
     'Syntax error parsing real: \'',
     'Syntax error: \'virtual\' not allowed before var declaration',
     'This may be because there\'s no search path specified with -I<dir>.',
-    'Thread scheduler is unable to provide requested ',
     'Unexpected connection to arrayed port',
     'Unhandled attribute type',
     'Unknown Error Code: ',
@@ -243,7 +242,10 @@ sub read_messages {
 
 sub read_outputs {
   file:
-    foreach my $filename (glob ("$root/test_regress/t/*.out $root/docs/gen/*.rst")) {
+    foreach my $filename (glob ("$root/test_regress/t/*.pl"
+                                . " $root/test_regress/t/*.out"
+                                . " $root/docs/gen/*.rst")) {
+        next if $filename =~ /t_dist_warn_coverage/;  # Avoid our own suppressions
         my $fh = IO::File->new("<$filename")
             or error("$! $filename");
         while (my $line = ($fh && $fh->getline)) {
diff --git a/test_regress/t/t_udp_tableeof_bad.out b/test_regress/t/t_udp_tableeof_bad.out
deleted file mode 100644
index bf61e32d3..000000000
--- a/test_regress/t/t_udp_tableeof_bad.out
+++ /dev/null
@@ -1,3 +0,0 @@
-%Error: t/t_udp_tableeof_bad.v:16:1: EOF in 'table'
-%Error: t/t_udp_tableeof_bad.v:16:1: syntax error, unexpected end of file, expecting TABLE LINE or endtable
-%Error: Cannot continue
diff --git a/test_regress/t/t_udp_tableeof_bad.pl b/test_regress/t/t_udp_tableeof_bad.pl
index fc220ea47..677258838 100755
--- a/test_regress/t/t_udp_tableeof_bad.pl
+++ b/test_regress/t/t_udp_tableeof_bad.pl
@@ -13,7 +13,8 @@ scenarios(linter => 1);
 lint(
     verilator_flags2 => ["--lint-only --bbox-unsup"],
     fails => $Self->{vlt_all},
-    expect_filename => $Self->{golden_filename},
+    # Cannot use .out, get "$end" or "end of file" depending on bison version
+    expect => qr/EOF in 'table'/,
     );
 
 ok(1);