[Cmake-commits] [cmake-commits] hoffman committed cmCTestTestHandler.cxx 1.119 1.120

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestTestHandler.cxx 
Log Message:
Add label summary times to ctest default output.  Also, remove parallel time output.  Add flag to disable label summary.


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.119
retrieving revision 1.120
diff -C 2 -d -r1.119 -r1.120
*** cmCTestTestHandler.cxx	10 Sep 2009 15:16:08 -0000	1.119
--- cmCTestTestHandler.cxx	11 Sep 2009 17:34:35 -0000	1.120
***************
*** 590,602 ****
                 << failed.size() << " tests failed out of " 
                 << total << std::endl); 
!     double totalTestTime = 0;
! 
!     for(cmCTestTestHandler::TestResultsVector::size_type cc = 0;
!         cc < this->TestResults.size(); cc ++ )
        {
!       cmCTestTestResult *result = &this->TestResults[cc];
!       totalTestTime += result->ExecutionTime;
        }
-     
      char realBuf[1024];
      sprintf(realBuf, "%6.2f sec", (double)(clock_finish - clock_start));
--- 590,597 ----
                 << failed.size() << " tests failed out of " 
                 << total << std::endl); 
!     if(this->CTest->GetLabelSummary())
        {
!       this->PrintLabelSummary();
        }
      char realBuf[1024];
      sprintf(realBuf, "%6.2f sec", (double)(clock_finish - clock_start));
***************
*** 604,612 ****
                 << realBuf << "\n" );
  
-     char totalBuf[1024];
-     sprintf(totalBuf, "%6.2f sec", totalTestTime); 
-     cmCTestLog(this->CTest, HANDLER_OUTPUT, "\nTotal Test time (parallel) = "
-                <<  totalBuf << "\n" );
- 
      if (failed.size())
        {
--- 599,602 ----
***************
*** 673,676 ****
--- 663,667 ----
    std::set<cmStdString> labels;
    // initialize maps
+   std::string::size_type maxlen = 0;
    for(; it != this->TestList.end(); ++it)
      {
***************
*** 681,684 ****
--- 672,679 ----
            l !=  p.Labels.end(); ++l)
          {
+         if((*l).size() > maxlen)
+           {
+           maxlen = (*l).size();
+           }
          labels.insert(*l);
          labelTimes[*l] = 0;
***************
*** 697,717 ****
        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;
!         }
      }
  }
  
--- 692,729 ----
        for(std::vector<std::string>::iterator l = p.Labels.begin();
            l !=  p.Labels.end(); ++l)
!         {  
          labelTimes[*l] += result.ExecutionTime;
          }
        }
      }
!   // now print times  
!   if(labels.size())
!     {
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, "\nLabel Time Summary:");
!     }
    for(std::set<cmStdString>::const_iterator i = labels.begin();
        i != labels.end(); ++i)
      {
!     std::string label = *i;
!     label.resize(maxlen +3, ' ');
!     char buf[1024];
!     sprintf(buf, "%6.2f sec", labelTimes[*i]);
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, "\n"
!                << label << " = " << buf );
      if ( this->LogFile )
!       {
!       *this->LogFile << "\n" << *i << " = "
!                      << buf << "\n";
!       }
      }
+   if(labels.size())
+     { 
+     if(this->LogFile)
+       {
+       *this->LogFile << "\n";
+       }
+     cmCTestLog(this->CTest, HANDLER_OUTPUT, "\n");
+     }
+ 
  }