Changeset 27536 for other-projects/nightly-tasks/diffcol
- Timestamp:
- 2013-06-04T16:29:10+12:00 (11 years ago)
- Location:
- other-projects/nightly-tasks/diffcol/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl
r21711 r27536 39 39 use parsargv; 40 40 use util; 41 use FileUtils; 41 42 use logdiff; 42 43 use cfgdiff; … … 46 47 47 48 #--Global Variables Declaration----------- 48 $gv_strModelColRoot = & util::filename_cat($ENV{'GSDLHOME'},"/model-collect");49 $gv_strTestColRoot = & util::filename_cat($ENV{'GSDLHOME'},"/collect");49 $gv_strModelColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/model-collect"); 50 $gv_strTestColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/collect"); 50 51 51 52 $gv_blnErrorStop = "false"; … … 122 123 123 124 VobPrint("Start Comparing \"$strEachFolder\"\n",0); 124 my $strModelFolder = & util::filename_cat($strModelCol,$strEachFolder);125 my $strTestFolder = & util::filename_cat($strTestCol,$strEachFolder);125 my $strModelFolder = &FileUtils::filenameConcatenate($strModelCol,$strEachFolder); 126 my $strTestFolder = &FileUtils::filenameConcatenate($strTestCol,$strEachFolder); 126 127 $intNumberOfErrors = scalar(@Errors); 127 128 push(@Errors,TestEach($strModelFolder,$strTestFolder,0)); … … 143 144 144 145 # Testing Log files 145 # my $strModelLog = & util::filename_cat($strModelCol,"log");146 # my $strTestLog = & util::filename_cat($strTestCol,"log");146 # my $strModelLog = &FileUtils::filenameConcatenate($strModelCol,"log"); 147 # my $strTestLog = &FileUtils::filenameConcatenate($strTestCol,"log"); 147 148 # 148 149 # if(-e $strModelLog && -e $strTestLog) … … 181 182 182 183 # Testing the build.cfg 183 my $strModelBcfg = & util::filename_cat($strModelCol,"index","build.cfg");184 my $strTestBcfg = & util::filename_cat($strTestCol,"index","build.cfg");184 my $strModelBcfg = &FileUtils::filenameConcatenate($strModelCol,"index","build.cfg"); 185 my $strTestBcfg = &FileUtils::filenameConcatenate($strTestCol,"index","build.cfg"); 185 186 186 187 if(-e $strModelBcfg && -e $strTestBcfg) … … 232 233 # Testing the collect.cfg 233 234 234 my $strModelCcfg = & util::filename_cat($strModelCol,"etc","collect.cfg");235 my $strTestCcfg = & util::filename_cat($strTestCol,"etc","collect.cfg");235 my $strModelCcfg = &FileUtils::filenameConcatenate($strModelCol,"etc","collect.cfg"); 236 my $strTestCcfg = &FileUtils::filenameConcatenate($strTestCol,"etc","collect.cfg"); 236 237 237 238 if(-e $strModelCcfg && -e $strTestCcfg) … … 285 286 # Testing database 286 287 287 my $strModelGdb = & util::filename_cat($strModelCol,"index","text","$strColName.ldb");288 my $strTestGdb = & util::filename_cat($strTestCol,"index","text","$strColName.ldb");288 my $strModelGdb = &FileUtils::filenameConcatenate($strModelCol,"index","text","$strColName.ldb"); 289 my $strTestGdb = &FileUtils::filenameConcatenate($strTestCol,"index","text","$strColName.ldb"); 289 290 290 291 if(-e $strModelGdb && -e $strTestGdb) … … 523 524 foreach my $strEachFile (@aryInModel) 524 525 { 525 my $strNewModel = & util::filename_cat($strModel,$strEachFile);526 my $strNewTest = & util::filename_cat($strTest,$strEachFile);526 my $strNewModel = &FileUtils::filenameConcatenate($strModel,$strEachFile); 527 my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile); 527 528 if(!($strEachFile eq "log" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/\.(l|b)db$/g)) 528 529 { … … 543 544 foreach my $strEachFile (@aryCorrectFiles) 544 545 { 545 my $strNewModel = & util::filename_cat($strModel,$strEachFile);546 my $strNewTest = & util::filename_cat($strTest,$strEachFile);546 my $strNewModel = &FileUtils::filenameConcatenate($strModel,$strEachFile); 547 my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile); 547 548 if(!($strEachFile eq "log" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/\.(l|b)db$/g)) 548 549 { … … 749 750 { 750 751 my @ErrorsInEachCol; 751 my $strModelCol = & util::filename_cat($gv_strModelColRoot,$strColName);752 my $strTestCol = & util::filename_cat($gv_strTestColRoot,$strColName);752 my $strModelCol = &FileUtils::filenameConcatenate($gv_strModelColRoot,$strColName); 753 my $strTestCol = &FileUtils::filenameConcatenate($gv_strTestColRoot,$strColName); 753 754 754 755 #--Output(Start) -
other-projects/nightly-tasks/diffcol/trunk/task
r27524 r27536 1 1 #!/bin/bash 2 3 if [ "x$TASK_HOME" == "x" ]; then 4 TASK_HOME=`pwd`; 5 fi 2 6 3 7 export DATA_DIR=$TASK_HOME/diffcol-data
Note:
See TracChangeset
for help on using the changeset viewer.