Changeset 36868


Ignore:
Timestamp:
2022-10-31T17:35:17+13:00 (5 weeks ago)
Author:
anupama
Message:

Forgot to commit a tidier version

File:
1 edited

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

    r36807 r36868  
    192192
    193193
    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") {
    202195    # Testing the build.cfg
    203196    my $strModelBcfg =  &FileUtils::filenameConcatenate($strModelCol,"index","build.cfg");
    204197    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       
    210199    if(-e $strModelBcfg && -e $strTestBcfg)
    211200    {
     
    258247    my $strModelCcfg =  &FileUtils::filenameConcatenate($strModelCol,"etc","collect.cfg");
    259248    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       
    265250    if(-e $strModelCcfg && -e $strTestCcfg)
    266251    {
     
    310295
    311296    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 
    313300    # Testing databases
    314301
     
    322309    }
    323310   
    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";
    326314   
    327315    my $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"index","text","$strColName$flat_db_ext");   
     
    363351    #my $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb);
    364352   
    365 #   $gv_blnDebugging = 1;
    366    
    367353    $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb, $strColName,$gv_test_os, $gv_model_os,$strTestCol,$strModelCol, $gv_blnDebugging);
    368 #   $gv_blnDebugging = 0;
    369354   
    370355    if($strGdbError ne "")
     
    10221007    $gv_model_os = $model_os; # tends to be linux
    10231008   
    1024     #print STDERR "@@@@@ test_os: $test_os\n";
    1025     #print STDERR "@@@@@ model_os: $model_os\n";
     1009#print STDERR "@@@@@ test_os: $test_os\n";
     1010#print STDERR "@@@@@ model_os: $model_os\n";
    10261011
    10271012    $gv_blnDebugging = $debugging;
Note: See TracChangeset for help on using the changeset viewer.