Changeset 27725

Show
Ignore:
Timestamp:
28.06.2013 17:40:20 (6 years ago)
Author:
ak19
Message:

Images can be different in size when generated by imagemagick on win/darwin/linux. For now we ignore images when diffing, later we will have a separate ImageDiff?.pm perl module as we have gdbdiff.pm at the moment

Location:
other-projects/nightly-tasks/diffcol/trunk
Files:
3 modified

Legend:

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

    r27695 r27725  
    591591                my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile); 
    592592                # now additionally ignoring the earliestDatestamp file and the index/idx/*.idh binary file when diffing file  
    593                 if(!($strEachFile eq "log" || $strEachFile eq "earliestDatestamp" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/\.((g|j|l|b)db|idh|i.*|wa|td|tsd|ti|t|tl|w)$/g)) #$strEachFile =~ m/\.invf\.state\.\d+/ 
     593                if(!($strEachFile eq "log" || $strEachFile eq "earliestDatestamp" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/\.((g|j|l|b)db|idh|i.*|wa|td|tsd|ti|t|tl|w|jpe?g|gif|png)$/g)) 
    594594                { 
    595595                    push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel)); 
     
    611611                my $strNewModel = &FileUtils::filenameConcatenate($strModel,$strEachFile); 
    612612                my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile); 
    613                 if(!($strEachFile eq "log" || $strEachFile eq "earliestDatestamp" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/\.((g|j|l|b)db|idh|i.*|wa|td|tsd|ti|t|tl|w)$/g)) 
     613                if(!($strEachFile eq "log" || $strEachFile eq "earliestDatestamp" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/\.((g|j|l|b)db|idh|i.*|wa|td|tsd|ti|t|tl|w|jpe?g|gif|png)$/g)) 
    614614                { 
    615615                    push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel)); 
     
    625625    else 
    626626    { 
    627         my $ignore_line_re = "<Metadata name=\"(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate)\">.*</Metadata>\\s*\\n*"; 
     627        my $ignore_line_re = "<Metadata name=\"(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate|ImageSize)\">.*</Metadata>\\s*\\n*"; 
    628628        my $strResult; 
    629629 
     
    657657                $$win_contents =~ s@\r\n@\n@mg; # #http://stackoverflow.com/questions/650743/in-perl-how-to-do-you-remove-m-from-a-file 
    658658                 
    659                 #FOR MAC: old macs use CR carriage return (see http://www.perlmonks.org/?node_id=745018), so replace with \n ? 
     659                #FOR MAC: old macs use CR carriage return (see http://www.perlmonks.org/?node_id=745018), so replace with \n?) 
    660660                # $$win_contents =~ s@\r@\n@mg; 
    661661            } 
  • other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm

    r27701 r27725  
    144144     
    145145    # leaving the ignore regex as it used to be in the following, in case it helps with single line comparisons 
    146     $diff_gdb = &diffutil::GenerateOutput($diff_gdb,"^<(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate)>.*"); 
     146    $diff_gdb = &diffutil::GenerateOutput($diff_gdb,"^<(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate|ImageSize)>.*"); 
    147147 
    148148    if($diff_gdb eq "") 
  • other-projects/nightly-tasks/diffcol/trunk/task.pl

    r27724 r27725  
    627627    #default identity dir 
    628628    if ( ! exists $ENV{'IDENTITY_DIR'} ) { 
    629     $ENV{'IDENTITY_DIR'} = "$ENV{'HOME'}${sep}.ssh"; 
     629    $ENV{'IDENTITY_DIR'} = "$ENV{'HOME'}${sep}.ssh"; # "C:\\Research\\Nightly\\tools\\keys" on windows, see environment.pl 
    630630    } 
    631631    if (! exists $ENV{'SNAPSHOT_MODE'} ) {