Changeset 36868

Timestamp:

2022-10-31T17:35:17+13:00 (18 months ago)

Author:

anupama

Message:

Forgot to commit a tidier version

File:

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

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

@@ -192 +192 @@
 
 
-    ## TODO: Added to get GS3 diffcol to work, as there is no build/collect.cfg file in GS3
-    ## Now that other GS3 diffcol errors have been fixed (except for Word-PDF-Enhanced collection,
-    ## where the model-col needs to be built & committed from a Win machine),
-    ## need to comment out the following 3 newly added lines and fix any remaining issues
-#   if($ENV{'GSVERSION'} eq "3") {
-#       return @Errors;
-#   }
-  if($ENV{'GSVERSION'} eq "3") {
+  if($ENV{'GSVERSION'} ne "3") {
     # Testing the build.cfg
     my $strModelBcfg =  &FileUtils::filenameConcatenate($strModelCol,"index","build.cfg");
     my $strTestBcfg =  &FileUtils::filenameConcatenate($strTestCol,"index","build.cfg");
-    #if($ENV{'GSVERSION'} eq "3") {
-    #   $strModelBcfg = &FileUtils::filenameConcatenate($strModelCol,"index","buildConfig.xml");
-    #   $strTestBcfg = &FileUtils::filenameConcatenate($strTestCol,"index","buildConfig.xml");
-    #}
-    
+        
     if(-e $strModelBcfg && -e $strTestBcfg)
     {
@@ -258 +247 @@
     my $strModelCcfg =  &FileUtils::filenameConcatenate($strModelCol,"etc","collect.cfg");
     my $strTestCcfg =  &FileUtils::filenameConcatenate($strTestCol,"etc","collect.cfg");
-    #if($ENV{'GSVERSION'} eq "3") {
-    #   $strModelBcfg = &FileUtils::filenameConcatenate($strModelCol,"etc","collectConfig.xml");
-    #   $strTestBcfg = &FileUtils::filenameConcatenate($strTestCol,"etc","collectConfig.xml");
-    #}
-    
+        
     if(-e $strModelCcfg && -e $strTestCcfg)
     {
@@ -310 +295 @@
 
     VobPrint ("\n",$intLevel);
-  } 
+  } # End of code that only really pertains to GS2, as GS3's buildConfig.xml gets diffcolled with XML files later
+  
+  
     # Testing databases
 
@@ -322 +309 @@
     }
     
-    #print STDERR "*********** USING DB EXTENSION: $flat_db_ext\n";
-    #print STDERR "@@@ PERL_PERTURB_KEYS: ".$ENV{'PERL_PERTURB_KEYS'}."\n";
+#print STDERR "*********** USING DB EXTENSION: $flat_db_ext\n";
+#print STDERR "@@@ PERL_PERTURB_KEYS: ".$ENV{'PERL_PERTURB_KEYS'}."\n";
+#print STDERR "@@@ PERL_HASH_SEED: ".$ENV{'PERL_HASH_SEED'}."\n";
     
     my $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"index","text","$strColName$flat_db_ext");    
@@ -363 +351 @@
     #my $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb);
     
-#   $gv_blnDebugging = 1;
-    
     $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb, $strColName,$gv_test_os, $gv_model_os,$strTestCol,$strModelCol, $gv_blnDebugging);
-#   $gv_blnDebugging = 0;
     
     if($strGdbError ne "")
@@ -1022 +1007 @@
     $gv_model_os = $model_os; # tends to be linux
     
-    #print STDERR "@@@@@ test_os: $test_os\n";
-    #print STDERR "@@@@@ model_os: $model_os\n";
+#print STDERR "@@@@@ test_os: $test_os\n";
+#print STDERR "@@@@@ model_os: $model_os\n";
 
     $gv_blnDebugging = $debugging;