[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestTestHandler.cxx 1.104 1.105 cmCTestTestHandler.h 1.38 1.39

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv6231/Source/CTest

Modified Files:
	cmCTestTestHandler.cxx cmCTestTestHandler.h 
Log Message:
Fixed overwriting of a previous change set


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.104
retrieving revision 1.105
diff -C 2 -d -r1.104 -r1.105
*** cmCTestTestHandler.cxx	19 Aug 2009 12:58:34 -0000	1.104
--- cmCTestTestHandler.cxx	19 Aug 2009 13:24:55 -0000	1.105
***************
*** 659,662 ****
--- 659,714 ----
  
  //----------------------------------------------------------------------
+ void cmCTestTestHandler::PrintLabelSummary()
+ {
+   cmCTestTestHandler::ListOfTests::iterator it = this->TestList.begin();
+   cmCTestTestHandler::TestResultsVector::iterator ri =
+     this->TestResults.begin();
+   std::map<cmStdString, double> labelTimes;
+   std::set<cmStdString> labels;
+   // initialize maps
+   for(; it != this->TestList.end(); ++it)
+     {
+     cmCTestTestProperties& p = *it;
+     if(p.Labels.size() != 0)
+       {
+       for(std::vector<std::string>::iterator l = p.Labels.begin();
+           l !=  p.Labels.end(); ++l)
+         {
+         labels.insert(*l);
+         labelTimes[*l] = 0;
+         }
+       }
+     }
+   it = this->TestList.begin();
+   ri = this->TestResults.begin();
+   // fill maps
+   for(; it != this->TestList.end(); ++it, ++ri)
+     {
+     cmCTestTestProperties& p = *it;
+     cmCTestTestResult &result = *ri;
+     if(p.Labels.size() != 0)
+       {
+       for(std::vector<std::string>::iterator l = p.Labels.begin();
+           l !=  p.Labels.end(); ++l)
+         {
+         labelTimes[*l] += result.ExecutionTime;
+         }
+       }
+     }
+   // now print times
+   for(std::set<cmStdString>::const_iterator i = labels.begin();
+       i != labels.end(); ++i)
+     {
+     cmCTestLog(this->CTest, HANDLER_OUTPUT, "\nTime in "
+                << *i << " = " << labelTimes[*i] << " sec" );
+     if ( this->LogFile )
+         {
+         *this->LogFile << "\nTime in " << *i << " = "
+                        << labelTimes[*i] << " sec"  << std::endl;
+         }
+     }
+ }
+ 
+ //----------------------------------------------------------------------
  void cmCTestTestHandler::ProcessOneTest(cmCTestTestProperties *it,
                                          std::vector<cmStdString> &passed,

Index: cmCTestTestHandler.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -C 2 -d -r1.38 -r1.39
*** cmCTestTestHandler.h	19 Aug 2009 12:58:36 -0000	1.38
--- cmCTestTestHandler.h	19 Aug 2009 13:24:55 -0000	1.39
***************
*** 187,190 ****
--- 187,191 ----
    virtual void GenerateDartOutput(std::ostream& os);
  
+   void PrintLabelSummary();
    /**
     * Run the tests for a directory and any subdirectories