Changeset 27725

Timestamp:

2013-06-28T17:40:20+12:00 (11 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:

• diffcol/diffcol.pl (modified) (4 diffs)
• diffcol/gdbdiff.pm (modified) (1 diff)
• task.pl (modified) (1 diff)

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

@@ -591 +591 @@
                 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 "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+/
+                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))
                 {
                     push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel));
@@ -611 +611 @@
                 my $strNewModel = &FileUtils::filenameConcatenate($strModel,$strEachFile);
                 my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile);
-                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))
+                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))
                 {
                     push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel));
@@ -625 +625 @@
     else
     {
-        my $ignore_line_re = "<Metadata name=\"(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate)\">.*</Metadata>\\s*\\n*";
+        my $ignore_line_re = "<Metadata name=\"(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate|ImageSize)\">.*</Metadata>\\s*\\n*";
         my $strResult;
 
@@ -657 +657 @@
                 $$win_contents =~ s@\r\n@\n@mg; # #http://stackoverflow.com/questions/650743/in-perl-how-to-do-you-remove-m-from-a-file
                 
-                #FOR MAC: old macs use CR carriage return (see http://www.perlmonks.org/?node_id=745018), so replace with \n ?
+                #FOR MAC: old macs use CR carriage return (see http://www.perlmonks.org/?node_id=745018), so replace with \n?)
                 # $$win_contents =~ s@\r@\n@mg;
             }

other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm

@@ -144 +144 @@
     
     # leaving the ignore regex as it used to be in the following, in case it helps with single line comparisons
-    $diff_gdb = &diffutil::GenerateOutput($diff_gdb,"^<(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate)>.*");
+    $diff_gdb = &diffutil::GenerateOutput($diff_gdb,"^<(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate|ImageSize)>.*");
 
     if($diff_gdb eq "")

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

@@ -627 +627 @@
     #default identity dir
     if ( ! exists $ENV{'IDENTITY_DIR'} ) {
-    $ENV{'IDENTITY_DIR'} = "$ENV{'HOME'}${sep}.ssh";
+    $ENV{'IDENTITY_DIR'} = "$ENV{'HOME'}${sep}.ssh"; # "C:\\Research\\Nightly\\tools\\keys" on windows, see environment.pl
     }
     if (! exists $ENV{'SNAPSHOT_MODE'} ) {