[Cmake-commits] [cmake-commits] hoffman committed cmCTestTestHandler.cxx 1.98 1.99

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Jul 27 14:17:41 EDT 2009


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

Modified Files:
	cmCTestTestHandler.cxx 
Log Message:
ENH: add test times and a total time to the output of command line ctest


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.98
retrieving revision 1.99
diff -C 2 -d -r1.98 -r1.99
*** cmCTestTestHandler.cxx	19 Jul 2009 17:40:38 -0000	1.98
--- cmCTestTestHandler.cxx	27 Jul 2009 18:17:38 -0000	1.99
***************
*** 575,578 ****
--- 575,579 ----
        percent = 99;
        }
+     
      if(!this->CTest->GetParallelSubprocess())
        {
***************
*** 580,584 ****
                   << static_cast<int>(percent + .5) << "% tests passed, "
                   << failed.size() << " tests failed out of " 
!                  << total << std::endl);
        }
  
--- 581,599 ----
                   << static_cast<int>(percent + .5) << "% tests passed, "
                   << 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 buf[1024];
!       sprintf(buf, "%6.2f sec", totalTestTime); 
!       cmCTestLog(this->CTest, HANDLER_OUTPUT, "\nTotal CPU time = " 
!                  <<  buf << "\n" );
!       
        }
  
***************
*** 824,828 ****
          {
          cres.Status = cmCTestTestHandler::COMPLETED;
!         cmCTestLog(this->CTest, HANDLER_OUTPUT,   "   Passed" << std::endl);
          }
        else
--- 839,843 ----
          {
          cres.Status = cmCTestTestHandler::COMPLETED;
!         cmCTestLog(this->CTest, HANDLER_OUTPUT,   "   Passed  " );
          }
        else
***************
*** 830,839 ****
          cres.Status = cmCTestTestHandler::FAILED;
          cmCTestLog(this->CTest, HANDLER_OUTPUT,
!                    "***Failed " << reason << std::endl);
          }
        }
      else if ( res == cmsysProcess_State_Expired )
        {
!       cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Timeout" << std::endl);
        cres.Status = cmCTestTestHandler::TIMEOUT;
        }
--- 845,854 ----
          cres.Status = cmCTestTestHandler::FAILED;
          cmCTestLog(this->CTest, HANDLER_OUTPUT,
!                    "***Failed " << reason );
          }
        }
      else if ( res == cmsysProcess_State_Expired )
        {
!       cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Timeout");
        cres.Status = cmCTestTestHandler::TIMEOUT;
        }
***************
*** 863,872 ****
            cres.Status = cmCTestTestHandler::OTHER_FAULT;
          }
-       cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl);
        }
      else // if ( res == cmsysProcess_State_Error )
        {
!       cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Bad command " << res
!                  << std::endl);
        cres.Status = cmCTestTestHandler::BAD_COMMAND;
        }
--- 878,885 ----
            cres.Status = cmCTestTestHandler::OTHER_FAULT;
          }
        }
      else // if ( res == cmsysProcess_State_Error )
        {
!       cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Bad command " << res );
        cres.Status = cmCTestTestHandler::BAD_COMMAND;
        }
***************
*** 880,883 ****
--- 893,899 ----
        failed.push_back(testname);
        }
+     char buf[1024];
+     sprintf(buf, "%6.2f sec", cres.ExecutionTime);
+     cmCTestLog(this->CTest, HANDLER_OUTPUT, buf << "\n" );
      if (!output.empty() && output.find("<DartMeasurement") != output.npos)
        {
***************
*** 1542,1546 ****
                           static_cast<int>(this->TotalNumberOfTests));
      }
- 
    this->EndTest = this->CTest->CurrentTime();
    this->EndTestTime = static_cast<unsigned int>(cmSystemTools::GetTime());
--- 1558,1561 ----



More information about the Cmake-commits mailing list