Changeset 27725 for other-projects/nightly-tasks/diffcol
- Timestamp:
- 2013-06-28T17:40:20+12:00 (11 years ago)
- Location:
- other-projects/nightly-tasks/diffcol/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl
r27695 r27725 591 591 my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile); 592 592 # 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)) 594 594 { 595 595 push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel)); … … 611 611 my $strNewModel = &FileUtils::filenameConcatenate($strModel,$strEachFile); 612 612 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)) 614 614 { 615 615 push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel)); … … 625 625 else 626 626 { 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*"; 628 628 my $strResult; 629 629 … … 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 658 658 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?) 660 660 # $$win_contents =~ s@\r@\n@mg; 661 661 } -
other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm
r27701 r27725 144 144 145 145 # 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)>.*"); 147 147 148 148 if($diff_gdb eq "") -
other-projects/nightly-tasks/diffcol/trunk/task.pl
r27724 r27725 627 627 #default identity dir 628 628 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 630 630 } 631 631 if (! exists $ENV{'SNAPSHOT_MODE'} ) {
Note:
See TracChangeset
for help on using the changeset viewer.