ctests: allow excluding patterns

[lyx.git] / development / autotests / lyxStatus.pm

diff --git a/development/autotests/lyxStatus.pm b/development/autotests/lyxStatus.pm
index cfdeceb0f6a49bb46d7b03d0e7b7ce7d96865c9e..ce4c85d8b4ec1b094b9e0593f5e5cafa3663e237 100644 (file)
--- a/development/autotests/lyxStatus.pm
+++ b/development/autotests/lyxStatus.pm
@@ -144,6 +144,13 @@ sub newMatch(%)
   if (! defined($elem{"fileidx"})) {
     $elem{"fileidx"} = 1;
   }
+  if (exists($elem{"search"})) {
+    my $ref = ref($elem{"search"});
+    diestack("Wrong or invalid regex (ref == $ref) specified") if ($ref ne "Regexp");
+  }
+  else {
+    diestack("No search defined");
+  }
   diestack("No result defined") if (! defined($elem{"result"}));
   return(\%elem);
 }
@@ -193,32 +200,32 @@ sub checkForHeader($)
     $selem{name} = $1;
     unshift(@stack, \%selem);
     my @rElems = ();
-    $rElems[0] = newMatch("search" => '^\\\\master\s+(.*\.lyx)',
+    $rElems[0] = newMatch("search" => qr/^\\master\s+(.*\.lyx)/,
                           "filetype" => "prefix_only",
                           "result" => ["\\master ", ""]);
     if (keys %{$rFont}) {
       for my $ff ( keys %{$rFont}) {
        # fontentry of type '\font_roman default'
-       my $elem = newMatch("search" => '^\\\\font_' . $ff . '\s+[^"]*\s*$',
+       my $elem = newMatch("search" => qr/^\\font_$ff\s+[^\"]*\s*$/,
                             "filetype" => "replace_only",
                             "result" => ["\\font_$ff ", $rFont->{$ff}]);
        # fontentry of type '\font_roman "default"'
-       my $elem1 = newMatch("search" => '^\\\\font_' . $ff . '\s+"[^"]*"\s*$',
+       my $elem1 = newMatch("search" => qr/^\\font_$ff\s+\"[^\"]*\"\s*$/,
                             "filetype" => "replace_only",
                             "result" => ["\\font_$ff \"", $rFont->{$ff}, '"']);
        # fontentry of type '\font_roman "default" "default"'
-       my $elem2 = newMatch("search" => '^\\\\font_' . $ff . '\s+"(.*)"\s+"(.*)"\s*$',
+       my $elem2 = newMatch("search" => qr/^\\font_$ff\s+\"(.*)\"\s+\"default\"\s*$/,
                             "filetype" => "replace_only",
                             "result" => ["\\font_$ff ", '"', "1", '" "', $rFont->{$ff}, '"']);
        push(@rElems, $elem, $elem1, $elem2);
       }
     }
-    my $elemntf = newMatch("search" => '^\\\\use_non_tex_fonts\s+(false|true)',
+    my $elemntf = newMatch("search" => qr/^\\use_non_tex_fonts\s+(false|true)/,
                            "filetype" => "replace_only",
                            "result" => ["\\use_non_tex_fonts $useNonTexFont"]);
     push(@rElems, $elemntf);
     if (defined($inputEncoding)) {
-      my $inputenc = newMatch("search" =>  '^\\\\inputencoding\s+(' . $inputEncoding->{search} . ')',
+      my $inputenc = newMatch("search" =>  qr/^\\inputencoding\s+($inputEncoding->{search})/,
                              "filetype" => "replace_only",
                              "result" => ["\\inputencoding " . $inputEncoding->{out}]);
       push(@rElems, $inputenc);
@@ -239,16 +246,15 @@ sub checkForPreamble($)
     $selem{name} = $1;
     unshift(@stack, \%selem);
     my $rElem = newMatch("ext" => [".eps", ".png"],
-                         "search" => '^\\\\(photo|ecvpicture)(.*\{)(.*)\}',
+                         "search" => qr/^\\(photo|ecvpicture)(.*\{)(.*)\}/,
                          "fileidx" => 3,
                          "result" => ["\\", "1", "2", "3", "}"]);
     #
     # Remove comments from preamble
-    my $comments = newMatch("search" => '^([^%]*)([%]+)([^%]*)$',
+    my $comments = newMatch("search" => qr/^([^%]*)([%]+)([^%]*)$/,
                            "filetype" => "replace_only",
                            "result" => ["1", "2"]);
-    #setMatching([$rElem, $comments]);
-    setMatching([$rElem]);
+    setMatching([$rElem, $comments]);
     return(1);
   }
   return(0);
@@ -266,7 +272,7 @@ sub checkForLayoutStart($)
     unshift(@stack, \%selem);
     if ($selem{name} =~ /^(Picture|Photo)$/ ) {
       my $rElem = newMatch("ext" => [".eps", ".png"],
-                           "search" => '^(.+)',
+                           "search" => qr/^(.+)/,
                            "result" => ["", "", ""]);
       setMatching([$rElem]);
     }
@@ -286,7 +292,7 @@ sub checkForInsetStart($)
     $selem{name} = $1;
     unshift(@stack, \%selem);
     if ($selem{name} =~ /^(Graphics|External)$/) {
-      my $rElem = newMatch("search" => '^\s+filename\s+(.+)$',
+      my $rElem = newMatch("search" => qr/^\s+filename\s+(.+)$/,
                            "filetype" => "copy_only",
                            "result" => ["\tfilename ", "", ""]);
       setMatching([$rElem]);
@@ -307,24 +313,24 @@ sub checkForLatexCommand($)
        if ($param eq "bibtex") {
          my $rElem1 = newMatch("ext" => ".bib",
                                 "filetype" => "prefix_for_list",
-                                "search" => '^bibfiles\s+\"(.+)\"',
+                                "search" => qr/^bibfiles\s+\"(.+)\"/,
                                 "result" => ["bibfiles \"", "1", "\""]);
          my $rElem2 = newMatch("ext" => ".bst",
                                 "filetype" => "prefix_for_list",
-                                "search" => '^options\s+\"(.+)\"',
+                                "search" => qr/^options\s+\"(.+)\"/,
                                 "result" => ["options \"", "1", "\""]);
          setMatching([$rElem1, $rElem2]);
        }
       }
       elsif ($stack[0]->{name} =~ /^CommandInset\s+include$/) {
-       if ($param =~ /^(verbatiminput\*?|lstinputlisting)$/) {
-         my $rElem = newMatch("search" => '^filename\s+\"(.+)\"',
+       if ($param =~ /^(verbatiminput\*?|lstinputlisting|inputminted)$/) {
+         my $rElem = newMatch("search" => qr/^filename\s+\"(.+)\"/,
                                "filetype" => "copy_only",
                                "result" => ["filename \"", "", "\""]);
          setMatching([$rElem]);
        }
        elsif ($param =~ /^(include|input)$/) {
-         my $rElem = newMatch("search" => '^filename\s+\"(.+)\"',
+         my $rElem = newMatch("search" => qr/^filename\s+\"(.+)\"/,
                                "filetype" => "interpret",
                                "result" => ["filename \"", "", "\""]);
          setMatching([$rElem]);
@@ -359,7 +365,7 @@ sub checkLyxLine($)
     my $rMatch = getMatching();
     for my $m ( @{$rMatch}) {
       my $search = getSearch($m);
-      if ($l =~ /$search/) {
+      if ($l =~ $search) {
        my @matches = ($1, $2, $3, $4);
        my $filetype = getFileType($m);
        my @result2 = @{getResult($m)};