Changeset 28609 for other-projects/nightly-tasks

Timestamp:

2013-11-06T14:16:31+13:00 (10 years ago)

Author:

ak19

Message:

Fix to previous commit: fail.log has to be ignored elsewhere in the code.

File:

• other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl (modified) (3 diffs)

other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

@@ -580 +580 @@
         # Files to be skipped because they get generated on one OS but not the other
         # On windows, files of the form col.invf.state.\d\d\d\d get generated (e.g. Small-HTML.invf.state.1228) that aren't there on linux
-        my $skipfiles_re = qr/(\.invf\.state\.\d+$)|~$|earliestDatestamp$/; # Create a regex of all files to be skipped, see http://perldoc.perl.org/perlop.html
+        my $skipfiles_re = qr/(\.invf\.state\.\d+$)|~$|earliestDatestamp|fail.log$/; # Create a regex of all files to be skipped, see http://perldoc.perl.org/perlop.html
         @aryInModel = grep { $_ !~ m/$skipfiles_re/ } @aryInModel; # http://stackoverflow.com/questions/174292/what-is-the-best-way-to-delete-a-value-from-an-array-in-perl
         @aryInTest = grep { $_ !~ m/$skipfiles_re/ } @aryInTest;
@@ -596 +596 @@
                 my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile);
                 # now additionally ignoring the earliestDatestamp file and the index/idx/*.idh binary file when diffing file 
-                if(!($strEachFile eq "log" || $strEachFile eq "fail.log" || $strEachFile eq "earliestDatestamp" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/collect\.bak$/g || $strEachFile =~ m/\.((g|j|l|b)db|idh|i.*|wa|td|tsd|ti|t|tl|w|jpe?g|gif|png|wmf)$/g)) # wmf = windows meta file #  || $strEachFile =~ m/\~$/g to get rid of ~ files
+                if(!($strEachFile eq "log" || $strEachFile eq "earliestDatestamp" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/collect\.bak$/g || $strEachFile =~ m/\.((g|j|l|b)db|idh|i.*|wa|td|tsd|ti|t|tl|w|jpe?g|gif|png|wmf)$/g)) # wmf = windows meta file #  || $strEachFile =~ m/\~$/g to get rid of ~ files
                 {
                     push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel,$strColName));
@@ -616 +616 @@
                 my $strNewModel = &FileUtils::filenameConcatenate($strModel,$strEachFile);
                 my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile);
-                if(!($strEachFile eq "log" || $strEachFile eq "fail.log" || $strEachFile eq "earliestDatestamp" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/collect\.bak$/g || $strEachFile =~ m/\.((g|j|l|b)db|idh|i.*|wa|td|tsd|ti|t|tl|w|jpe?g|gif|png|wmf)$/g)) #  || $strEachFile =~ m/\~$/g to get rid of ~ files
+                if(!($strEachFile eq "log" || $strEachFile eq "earliestDatestamp" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/collect\.bak$/g || $strEachFile =~ m/\.((g|j|l|b)db|idh|i.*|wa|td|tsd|ti|t|tl|w|jpe?g|gif|png|wmf)$/g)) #  || $strEachFile =~ m/\~$/g to get rid of ~ files
                 {
                     push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel,$strColName));