Changeset 38024 for other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

Timestamp:

2023-09-05T20:42:35+12:00 (9 months ago)

Author:

anupama

Message:

1. Diffcol's task.pl's run_test and summarise both take the min-min-gs3 option as well. Diffcol produces a report with num 2 in filename for GS2 and num 3 in filename for GS3, so summarise command needs to know which one needs to be converted from XML to HTML. 2. Better regex and fixing spelling error in diffcol.pl.

File:

• other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl (modified) (7 diffs)

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

@@ -358 +358 @@
         print "<database succeeded=\"no\" location=\"$strModelGdb\"><message>";
         } else {
-        AlignPrint("Database Comparsion Result","Failed",$intLevel);
+        AlignPrint("Database Comparison Result","Failed",$intLevel);
         }
         VobPrint ("$strGdbError\n",$intLevel);
@@ -367 +367 @@
         
         $strGdbError = "$strGdbError";
-        $strGdbError = "Difference Found at Database Comparsion\n".$strGdbError."\n";
+        $strGdbError = "Difference Found at Database Comparison\n".$strGdbError."\n";
         #push(@Errors,$strGdbError);
     }
@@ -375 +375 @@
         print "<database succeeded=\"yes\" location=\"$strModelGdb\"/>";
         } else {
-        AlignPrint("Database Comparsion Result","Succeed",$intLevel);
+        AlignPrint("Database Comparison Result","Succeed",$intLevel);
         }
     }
@@ -607 +607 @@
         # Files to be skipped because they get generated on one OS but not the other
         # 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
-        my $skipfiles_re = qr/(\.invf\.state\.\d+$)|~$|earliestDatestamp|archiveinf-timestamp.out|fail\.log|oai-inf-tmp\.(gdb|jdb|lg)$/; # Create a regex of all files to be skipped, see http://perldoc.perl.org/perlop.html
+        my $skipfiles_re = qr/(\.invf\.state\.\d+$)|~$|earliestDatestamp|archiveinf-timestamp\.out|fail\.log|oai-inf-tmp\.(gdb|jdb|lg)$/; # Create a regex of all files to be skipped, see http://perldoc.perl.org/perlop.html
         @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
         @aryInTest = grep { $_ !~ m/$skipfiles_re/ } @aryInTest;
@@ -651 +651 @@
         if($intLevel == $gv_intVerbosity)
         {
-            if(scalar(@Errors) == 0){ AlignPrint("Contents Comparsion","Succeed",$intLevel);}
-            else {  AlignPrint("Contents Comparsion","Failed",$intLevel);}
+            if(scalar(@Errors) == 0){ AlignPrint("Contents Comparison","Succeed",$intLevel);}
+            else {  AlignPrint("Contents Comparison","Failed",$intLevel);}
         }
     }
@@ -875 +875 @@
             print "<folder-comparison location=\"$strModelFolder\" succeeded=\"yes\"/>\n";
         } else {
-            AlignPrint("Folder Comparsion","Succeed",$intLevel);
+            AlignPrint("Folder Comparison","Succeed",$intLevel);
         }
         return @TwoPointers;
@@ -884 +884 @@
             print "<folder-comparison location=\"$strModelFolder\" succeeded=\"no\"><message>\n";
         } else {
-            AlignPrint("Folder Comparsion","Failed",$intLevel);
+            AlignPrint("Folder Comparison","Failed",$intLevel);
         }