Changeset 27730 for other-projects/nightly-tasks/diffcol/trunk
- Timestamp:
- 2013-06-28T20:21:41+12:00 (11 years ago)
- Location:
- other-projects/nightly-tasks/diffcol/trunk/diffcol
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl
r27725 r27730 115 115 sub IndivTest 116 116 { 117 my ($strModelCol,$strTestCol ) = @_;117 my ($strModelCol,$strTestCol,$strColName) = @_; 118 118 my @Errors = (); 119 119 my $intNumberOfErrors = 0; … … 127 127 my $strTestFolder = &FileUtils::filenameConcatenate($strTestCol,$strEachFolder); 128 128 $intNumberOfErrors = scalar(@Errors); 129 push(@Errors,TestEach($strModelFolder,$strTestFolder,0 ));129 push(@Errors,TestEach($strModelFolder,$strTestFolder,0,$strColName)); 130 130 $intNumberOfErrors = scalar(@Errors) - $intNumberOfErrors; 131 131 VobPrint("End Comparing \"$strEachFolder\"\n",0); … … 404 404 VobPrint("Detail Testing Start\n",$intLevel); 405 405 } 406 push(@Errors,TestEach($strModelCol,$strTestCol,$intLevel ));406 push(@Errors,TestEach($strModelCol,$strTestCol,$intLevel,$strColName)); 407 407 $intNumberDiffs = scalar(@Errors) - $intNumberDiffs; 408 408 … … 564 564 sub TestEach 565 565 { 566 my ($strModel,$strTest,$intLevel ) = @_;566 my ($strModel,$strTest,$intLevel,$strColName) = @_; 567 567 my @Errors = (); 568 568 … … 593 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 push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel ));595 push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel,$strColName)); 596 596 } 597 597 else … … 613 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 push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel ));615 push(@Errors,TestEach($strNewModel,$strNewTest,$intLevel,$strColName)); 616 616 } 617 617 } … … 625 625 else 626 626 { 627 my $ignore_line_re = "<Metadata name=\"(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate|ImageSize)\">.*</Metadata>\\s*\\n*"; 627 my $ignore_line_re = "<Metadata name=\"(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate|ex.File.FileModifyDate|ex.File.FilePermissions|ImageSize)\">.*</Metadata>\\s*\\n*"; 628 628 629 my $strResult; 629 630 … … 643 644 $model_contents =~ s/$ignore_line_re//g; 644 645 $test_contents =~ s/$ignore_line_re//g; 646 647 # tmp dirs have subdirs with random numbers in name, remove randomly named subdir portion of path 648 $model_contents =~ s@(tmp[\\\/])(\d*[\\\/])@$1@g; 649 $test_contents =~ s@(tmp[\\\/])(\d*[\\\/])@$1@g; 645 650 651 # remove all absolute paths upto collect folder from <Metadata /> elements 652 $model_contents =~ s@(<Metadata name=\"[^\"]*\">(http:\/\/)?).*(collect[\\\/]$strColName)@$1$3@g; 653 $test_contents =~ s@(<Metadata name=\"[^\"]*\">(http:\/\/)?).*(collect[\\\/]$strColName)@$1$3@g; 654 655 646 656 # equalise/normalise the two doc.xml files for OS differences, if there are any 647 657 my $testIsWin = &isDocXMLFileWindows($test_contents); … … 687 697 else 688 698 { 699 # print STDERR "**** Diff is: $strResult\n"; # print any differences to the screen 700 689 701 my $strOutput = "Difference Report:\n$strResult\n"; 690 702 if ( $strOutputFormat eq "xml" ) { … … 873 885 if ($gv_strMode eq "Individual") 874 886 { 875 @ErrorsInEachCol = IndivTest($strModelCol,$strTestCol );887 @ErrorsInEachCol = IndivTest($strModelCol,$strTestCol,$strColName); 876 888 } 877 889 #----## -
other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm
r27725 r27730 66 66 # The total_numbytes field can vary depending on how many backslashes exist in the urls in the main body text, as each 67 67 # of these windows slashes get escaped with another backslash, and the resulting string is used as key into rel link db 68 my $ignore_line_re = "\n<(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate| total_numbytes)>([^\n])*";68 my $ignore_line_re = "\n<(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate|ex.File.FileModifyDate|ex.File.FilePermissions|total_numbytes)>([^\n])*"; 69 69 $model_text =~ s/$ignore_line_re//g; 70 70 $test_text =~ s/$ignore_line_re//g; 71 71 72 # tmp dirs have subdirs with random numbers in name, remove subdir 73 $model_text =~ s@(tmp[\\\/])(\d*[\\\/])@$1@g; 74 $test_text =~ s@(tmp[\\\/])(\d*[\\\/])@$1@g; 72 75 73 76 # if the OS doesn't match and one of them is windows, extra work needs to be done to bring the db files
Note:
See TracChangeset
for help on using the changeset viewer.