- Timestamp:
- 2022-10-31T17:35:17+13:00 (18 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl
r36807 r36868 192 192 193 193 194 ## TODO: Added to get GS3 diffcol to work, as there is no build/collect.cfg file in GS3 195 ## Now that other GS3 diffcol errors have been fixed (except for Word-PDF-Enhanced collection, 196 ## where the model-col needs to be built & committed from a Win machine), 197 ## need to comment out the following 3 newly added lines and fix any remaining issues 198 # if($ENV{'GSVERSION'} eq "3") { 199 # return @Errors; 200 # } 201 if($ENV{'GSVERSION'} eq "3") { 194 if($ENV{'GSVERSION'} ne "3") { 202 195 # Testing the build.cfg 203 196 my $strModelBcfg = &FileUtils::filenameConcatenate($strModelCol,"index","build.cfg"); 204 197 my $strTestBcfg = &FileUtils::filenameConcatenate($strTestCol,"index","build.cfg"); 205 #if($ENV{'GSVERSION'} eq "3") { 206 # $strModelBcfg = &FileUtils::filenameConcatenate($strModelCol,"index","buildConfig.xml"); 207 # $strTestBcfg = &FileUtils::filenameConcatenate($strTestCol,"index","buildConfig.xml"); 208 #} 209 198 210 199 if(-e $strModelBcfg && -e $strTestBcfg) 211 200 { … … 258 247 my $strModelCcfg = &FileUtils::filenameConcatenate($strModelCol,"etc","collect.cfg"); 259 248 my $strTestCcfg = &FileUtils::filenameConcatenate($strTestCol,"etc","collect.cfg"); 260 #if($ENV{'GSVERSION'} eq "3") { 261 # $strModelBcfg = &FileUtils::filenameConcatenate($strModelCol,"etc","collectConfig.xml"); 262 # $strTestBcfg = &FileUtils::filenameConcatenate($strTestCol,"etc","collectConfig.xml"); 263 #} 264 249 265 250 if(-e $strModelCcfg && -e $strTestCcfg) 266 251 { … … 310 295 311 296 VobPrint ("\n",$intLevel); 312 } 297 } # End of code that only really pertains to GS2, as GS3's buildConfig.xml gets diffcolled with XML files later 298 299 313 300 # Testing databases 314 301 … … 322 309 } 323 310 324 #print STDERR "*********** USING DB EXTENSION: $flat_db_ext\n"; 325 #print STDERR "@@@ PERL_PERTURB_KEYS: ".$ENV{'PERL_PERTURB_KEYS'}."\n"; 311 #print STDERR "*********** USING DB EXTENSION: $flat_db_ext\n"; 312 #print STDERR "@@@ PERL_PERTURB_KEYS: ".$ENV{'PERL_PERTURB_KEYS'}."\n"; 313 #print STDERR "@@@ PERL_HASH_SEED: ".$ENV{'PERL_HASH_SEED'}."\n"; 326 314 327 315 my $strTestGdb = &FileUtils::filenameConcatenate($strTestCol,"index","text","$strColName$flat_db_ext"); … … 363 351 #my $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb); 364 352 365 # $gv_blnDebugging = 1;366 367 353 $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb, $strColName,$gv_test_os, $gv_model_os,$strTestCol,$strModelCol, $gv_blnDebugging); 368 # $gv_blnDebugging = 0;369 354 370 355 if($strGdbError ne "") … … 1022 1007 $gv_model_os = $model_os; # tends to be linux 1023 1008 1024 1025 1009 #print STDERR "@@@@@ test_os: $test_os\n"; 1010 #print STDERR "@@@@@ model_os: $model_os\n"; 1026 1011 1027 1012 $gv_blnDebugging = $debugging;
Note:
See TracChangeset
for help on using the changeset viewer.