kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: add test times and a total time to the output of command line ctest

This commit is contained in:
Bill Hoffman 2009-07-27 14:17:38 -04:00
parent 2b849a77a6
commit 40850e7f1f
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/CTest/cmCTestTestHandler.cxx
View File

@ -574,12 +574,27 @@ int cmCTestTestHandler::ProcessHandler()
{ {
percent = 99; percent = 99;
} }
if(!this->CTest->GetParallelSubprocess()) if(!this->CTest->GetParallelSubprocess())
{ {
cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl
<< static_cast<int>(percent + .5) << "% tests passed, " << static_cast<int>(percent + .5) << "% tests passed, "
<< failed.size() << " tests failed out of " << failed.size() << " tests failed out of "
<< total << std::endl); << 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" );
} }
if (failed.size()) if (failed.size())
@ -823,18 +838,18 @@ void cmCTestTestHandler::ProcessOneTest(cmCTestTestProperties *it,
if((success && !it->WillFail) || (!success && it->WillFail)) if((success && !it->WillFail) || (!success && it->WillFail))
{ {
cres.Status = cmCTestTestHandler::COMPLETED; cres.Status = cmCTestTestHandler::COMPLETED;
cmCTestLog(this->CTest, HANDLER_OUTPUT, " Passed" << std::endl); cmCTestLog(this->CTest, HANDLER_OUTPUT, " Passed " );
} }
else else
{ {
cres.Status = cmCTestTestHandler::FAILED; cres.Status = cmCTestTestHandler::FAILED;
cmCTestLog(this->CTest, HANDLER_OUTPUT, cmCTestLog(this->CTest, HANDLER_OUTPUT,
"***Failed " << reason << std::endl); "***Failed " << reason );
} }
} }
else if ( res == cmsysProcess_State_Expired ) else if ( res == cmsysProcess_State_Expired )
{ {
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Timeout" << std::endl); cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Timeout");
cres.Status = cmCTestTestHandler::TIMEOUT; cres.Status = cmCTestTestHandler::TIMEOUT;
} }
else if ( res == cmsysProcess_State_Exception ) else if ( res == cmsysProcess_State_Exception )
@ -862,12 +877,10 @@ void cmCTestTestHandler::ProcessOneTest(cmCTestTestProperties *it,
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Other"); cmCTestLog(this->CTest, HANDLER_OUTPUT, "Other");
cres.Status = cmCTestTestHandler::OTHER_FAULT; cres.Status = cmCTestTestHandler::OTHER_FAULT;
} }
cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl);
} }
else // if ( res == cmsysProcess_State_Error ) else // if ( res == cmsysProcess_State_Error )
{ {
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Bad command " << res cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Bad command " << res );
<< std::endl);
cres.Status = cmCTestTestHandler::BAD_COMMAND; cres.Status = cmCTestTestHandler::BAD_COMMAND;
} }
@ -879,6 +892,9 @@ void cmCTestTestHandler::ProcessOneTest(cmCTestTestProperties *it,
{ {
failed.push_back(testname); 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) if (!output.empty() && output.find("<DartMeasurement") != output.npos)
{ {
if (this->DartStuff.find(output.c_str())) if (this->DartStuff.find(output.c_str()))
@ -1541,7 +1557,6 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed,
this->ProcessOneTest(&(*it), passed, failed, it->Index, this->ProcessOneTest(&(*it), passed, failed, it->Index,
static_cast<int>(this->TotalNumberOfTests)); static_cast<int>(this->TotalNumberOfTests));
} }
this->EndTest = this->CTest->CurrentTime(); this->EndTest = this->CTest->CurrentTime();
this->EndTestTime = static_cast<unsigned int>(cmSystemTools::GetTime()); this->EndTestTime = static_cast<unsigned int>(cmSystemTools::GetTime());
this->ElapsedTestingTime = cmSystemTools::GetTime() - elapsed_time_start; this->ElapsedTestingTime = cmSystemTools::GetTime() - elapsed_time_start;