From 7c728230614fca667794a046d5fcd793e46b0a3d Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Fri, 19 May 2017 12:58:32 +0200 Subject: [PATCH] keytests: Shorten the output of wrong matches to 10 lines --- development/autotests/searchPatterns.pl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/development/autotests/searchPatterns.pl b/development/autotests/searchPatterns.pl index 73a3572789..28f5e227fc 100755 --- a/development/autotests/searchPatterns.pl +++ b/development/autotests/searchPatterns.pl @@ -12,10 +12,10 @@ use strict; use warnings; -sub sexit($); # Print synax and exit -sub readPatterns($); # Process patterns file -sub processLogFile($); # -sub convertPattern($); # check for regex, comment +sub sexit($); # Print synax and exit +sub readPatterns($); # Process patterns file +sub processLogFile($); # +sub convertPattern($); # check for regex, comment sub convertSimplePattern($); # escape some chars, (e.g. ']' ==> '\]') sub printInvalid($$); # display lines which should not match @@ -199,6 +199,7 @@ sub processLogFile($) } #print "Searching for \"$pat\"\n"; $found = 0; + my $invalidmessages = 0; my $prevlines = () = $pat =~ /\\n/g; # Number of lines in pattern $prevlines = $minprevlines if ($prevlines < $minprevlines); my @prevl = (); @@ -231,8 +232,6 @@ sub processLogFile($) my $check = join("", @prevl); $line++; if ($check =~ /$pat/) { - @ErrPatterns = (); # clean search for not wanted patterns - $minprevlines = 0; my $fline = $line - $prevlines; print "$fline:\tfound \"$pat\"\n"; $found = 1; @@ -252,16 +251,15 @@ sub processLogFile($) else { push(@savedlines, $l); # Check for not wanted patterns - my $errindex = 0; for my $ep (@ErrPatterns) { if ($check =~ /$ep/) { $errors++; - my $fline = $line - $prevlines; - printInvalid($fline, $check); - #splice(@ErrPatterns, $errindex, 1); + if ($invalidmessages++ < 10) { + my $fline = $line - $prevlines; + &printInvalid($fline, $check); + } last; } - $errindex++; } } } @@ -270,6 +268,8 @@ sub processLogFile($) print "\tNOT found \"$pat\" in remainder of file\n"; $readsavedlines = 1; } + @ErrPatterns = (); # clean search for not wanted patterns + $minprevlines = 0; } close(FL); } -- 2.39.2