From 21aafe8f5007b697af1b75b5c0c3c85da327e994 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Wed, 25 Jan 2023 19:42:28 -0500 Subject: [PATCH] Tests: Fix file length issue (cousin of #3905) --- test_regress/t/t_dist_fixme.pl | 18 ++++-------------- test_regress/t/t_func_check.v | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/test_regress/t/t_dist_fixme.pl b/test_regress/t/t_dist_fixme.pl index 74c927883..0f36f4486 100755 --- a/test_regress/t/t_dist_fixme.pl +++ b/test_regress/t/t_dist_fixme.pl @@ -26,21 +26,11 @@ if (!-r "$root/.git") { $files =~ s/\s+/ /g; my @batch; my $n = 0; + my $re = qr/(FIX[M]E|BO[Z]O)/; foreach my $file (split /\s+/, $files) { - $batch[$n] .= $file . " "; - ++$n if (length($batch[$n]) > 10000); - } - - foreach my $bfiles (@batch) { - my $cmd = "cd $root && grep -n -P '(FIX" . "ME|BO" . "ZO)' $bfiles | sort"; - my $grep = `$cmd`; - if ($grep ne "") { - print "$grep\n"; - foreach my $line (split /\n/, $grep) { - print "L $line\n"; - # FIXMEV5 for use in develop-v5 branch until merged to master - $names{$1} = 1 if $line =~ /^([^:]+)/ && $line !~ /FIXMEV5/; - } + my $wholefile = file_contents($root . "/" . $file); + if ($wholefile =~ /$re/) { + $names{$file} = 1; } } if (scalar(%names) >= 1) { diff --git a/test_regress/t/t_func_check.v b/test_regress/t/t_func_check.v index c35a17347..9163d9406 100644 --- a/test_regress/t/t_func_check.v +++ b/test_regress/t/t_func_check.v @@ -56,7 +56,7 @@ module chk (input clk, input rst_l, input expr); wire noxs = ((expr ^ expr) == 1'b0); - // FIXMEV5: this test is dodgy, noxs can be proven constant, so this block + // TODO: this test is dodgy, noxs can be proven constant, so this block // should never relly trigger... reg hasx; always @ (noxs) begin