Typo spotted by Pavel

[lyx.git] / development / autotests / searchPatterns.pl

diff --git a/development/autotests/searchPatterns.pl b/development/autotests/searchPatterns.pl
index 3944ba94e00f71f842e78b2a0f64d9d5abbf0fb5..4202a1446c4330fed40a24e9ef772aad0366002f 100755 (executable)
--- a/development/autotests/searchPatterns.pl
+++ b/development/autotests/searchPatterns.pl
@@ -12,15 +12,18 @@
 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
 
+my ($logfile, $patternsfile, $basename, $newbase) = (undef, undef, undef);
 my %options = (
-  "log" => undef,
-  "patterns" => undef,
+  "log" => \$logfile,
+  "patterns" => \$patternsfile,
+  "base" => \$basename,
     );
 
 my @patterns = ();
@@ -32,11 +35,27 @@ for my $arg (@ARGV) {
   if ($arg =~ /^([^=]+)=(.+)$/) {
     my ($what, $val) = ($1, $2);
     if (exists($options{$what})) {
-      if (defined($options{$what})) {
-       print "Value for \"$what\" already defined\n";
-       &sexit(1);
+      if (defined(${$options{$what}})) {
+       print "Param \"$what\" already handled\n";
+       sexit(1);
+      }
+      ${$options{$what}} = $val;
+      if ($what ne "base") {
+       if ($what eq "log") {
+         if ($logfile =~ /^(.+)\.log[a-z]?\.txt$/) {
+           $newbase = $1;
+         }
+       }
+       elsif ($what eq "patterns") {
+         if ($patternsfile =~ /^(.+)\.ctrl$/) {
+           $newbase = $1;
+         }
+       }
+       else {
+         print "Software error, unhandled param \"$what\"\n";
+         &sexit(1);
+       }
       }
-      $options{$what} = $val;
     }
     else {
       print "Unknown param \"$what\"\n";
@@ -49,20 +68,38 @@ for my $arg (@ARGV) {
   }
 }
 
+$basename = $newbase if (! defined($basename));
+if (defined($basename)) {
+  for my $k (keys %options) {
+    next if ($k eq "base");
+    if (! defined(${$options{$k}})) {
+      if ($k eq "log") {
+       $logfile = $basename . ".loga.txt";
+      }
+      elsif ($k eq "patterns") {
+       $patternsfile = $basename . ".ctrl";
+      }
+    }
+  }
+}
 for my $k (keys %options) {
-  if (! defined($options{$k})) {
+  next if ($k eq "base");
+  if (! defined(${$options{$k}})) {
+    print "Param \"$k\" not defined\n";
     &sexit(1);
   }
-  if (! -r $options{$k}) {
-    print "File \"$options{$k}\" is not readable\n";
+  if (! -r ${$options{$k}}) {
+    print "File \"${$options{$k}}\" is not readable\n";
     &sexit(1);
   }
 }
 
 # Read patterns
-&readPatterns($options{"patterns"});
-if (&processLogFile($options{"log"}) > 0) {
-  print "Errors occured, exiting\n";
+print "\nControlfile\t= $patternsfile\n";
+print "Log-file\t= $logfile\n\n";
+&readPatterns($patternsfile);
+if (&processLogFile($logfile) > 0) {
+  print "Errors occurred, exiting\n";
   exit(1);
 }
 
@@ -73,7 +110,9 @@ sub syntax()
   print "Syntax:\n";
   print " $0";
   for my $k (keys %options) {
-    print " $k=<filename>";
+    my $type = "filename";
+    $type = "basename" if ($k eq "base");
+    print " \[$k=<$type>\]";
   }
   print "\n";
 }
@@ -92,12 +131,14 @@ sub convertPattern($)
     return("");
   }
   return $pat if ($pat =~ /^Comment:/);
-  if ($pat =~ s/^Regex:\s+//) {
+  if ($pat =~ s/^((Err)?Regex):\s+//) {
     # PassThrough variant
-    return($pat);
+    return($1 . ":" . $pat);
   }
-  elsif ($pat =~ s/^Simple:\s+//) {
-    return convertSimplePattern($pat);
+  elsif ($pat =~ s/^((Err)?Simple):\s+//) {
+    my $ermark = $2;
+    $ermark = "" if (!defined($ermark));
+    return $ermark . "Regex:" . &convertSimplePattern($pat);
   }
   else {
     # This should not happen.
@@ -159,8 +200,6 @@ sub readPatterns($)
 sub processLogFile($)
 {
   my ($log) = @_;
-  my $prevl = "\n";
-
   my $found;
   my $errors = 1;
   my @savedlines = ();
@@ -170,6 +209,8 @@ sub processLogFile($)
   if (open(FL, $log)) {
     $errors = 0;
     my $line = 0;
+    my @ErrPatterns = ();
+    my $minprevlines = 0;
     for my $pat (@patterns) {
       if ($pat =~ /^Comment:\s*(.*)$/) {
        $comment = $1;
@@ -179,8 +220,30 @@ sub processLogFile($)
        }
        next;
       }
+      if ($pat =~ /^(Err)?Regex:(.*)$/) {
+       my ($type, $regex) = ($1, $2);
+       next if ($regex eq "");
+       if (defined($type)) {
+         # This regex should not apply until next 'found line'
+         my $erlines = () = $regex =~ /\\n/g;
+         $minprevlines = $erlines if ($erlines > $minprevlines);
+         push(@ErrPatterns, $regex);
+         next;
+       }
+       else {
+         # This is the pattern which we are looking for
+         $pat = $regex;
+       }
+      }
       #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 = ();
+      for (my $i = 0; $i <= $prevlines; $i++) {
+       push(@prevl, "\n");
+      }
       my @lines = ();
       if ($readsavedlines) {
        # Last regex not found
@@ -200,13 +263,20 @@ sub processLogFile($)
          $l = <FL>;
        }
        last if (! $l);
-       my $check = $prevl . $l;
-       $prevl = $l;
+       for (my $i = 0; $i < $prevlines; $i++) {
+         $prevl[$i] = $prevl[$i+1];
+       }
+       $prevl[$prevlines] = $l;
+       my $check = join("", @prevl);
        $line++;
        if ($check =~ /$pat/) {
-         print "$line:\tfound \"$pat\"\n";
+         my $fline = $line - $prevlines;
+         print "$fline:\tfound \"$pat\"\n";
          $found = 1;
-         $prevl = "\n";        # Don't search this line again
+         # Do not search in already found area
+         for (my $i = 0; $i <= $prevlines; $i++) {
+           $prevl[$i] = "\n";
+         }
          if ($readsavedlines) {
            @savedlines = @lines;
          }
@@ -218,6 +288,17 @@ sub processLogFile($)
        }
        else {
          push(@savedlines, $l);
+         # Check for not wanted patterns
+         for my $ep (@ErrPatterns) {
+           if ($check =~ /$ep/) {
+             $errors++;
+             if ($invalidmessages++ < 10) {
+               my $fline = $line - $prevlines;
+               &printInvalid($fline, $check);
+             }
+             last;
+           }
+         }
        }
       }
       if (! $found) {
@@ -225,8 +306,20 @@ sub processLogFile($)
        print "\tNOT found \"$pat\" in remainder of file\n";
        $readsavedlines = 1;
       }
+      @ErrPatterns = ();       # clean search for not wanted patterns
+      $minprevlines = 0;
     }
     close(FL);
   }
   return($errors);
 }
+
+sub printInvalid($$)
+{
+  my ($line, $check) = @_;
+  my @chk = split(/\n/, $check);
+  print("$line:\tInvalid match: " . shift(@chk) . "\n");
+  for my $l (@chk) {
+    print("\t\t\t$l\n");
+  }
+}