Changeset 28609

Show
Ignore:
Timestamp:
06.11.2013 14:16:31 (6 years ago)
Author:
ak19
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

    r28608 r28609  
    580580        # Files to be skipped because they get generated on one OS but not the other 
    581581        # 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 
    582         my $skipfiles_re = qr/(\.invf\.state\.\d+$)|~$|earliestDatestamp$/; # Create a regex of all files to be skipped, see http://perldoc.perl.org/perlop.html 
     582        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 
    583583        @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 
    584584        @aryInTest = grep { $_ !~ m/$skipfiles_re/ } @aryInTest; 
     
    596596                my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile); 
    597597                # now additionally ignoring the earliestDatestamp file and the index/idx/*.idh binary file when diffing file  
    598                 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 
     598                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 
    599599                { 
    600600                    push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel,$strColName)); 
     
    616616                my $strNewModel = &FileUtils::filenameConcatenate($strModel,$strEachFile); 
    617617                my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile); 
    618                 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 
     618                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 
    619619                { 
    620620                    push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel,$strColName));