[Cmake-commits] [cmake-commits] hoffman committed cmCTestBuildHandler.cxx 1.75.2.1 1.75.2.2 cmCTestCoverageHandler.cxx 1.72.2.1 1.72.2.2 cmCTestMultiProcessHandler.cxx 1.25.2.2 1.25.2.3 cmCTestRunTest.cxx 1.22.2.1 1.22.2.2 cmCTestRunTest.h 1.11.2.1 1.11.2.2 cmCTestTestHandler.cxx 1.120.2.1 1.120.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Oct 9 16:11:35 EDT 2009
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv13963/Source/CTest
Modified Files:
Tag: CMake-2-8
cmCTestBuildHandler.cxx cmCTestCoverageHandler.cxx
cmCTestMultiProcessHandler.cxx cmCTestRunTest.cxx
cmCTestRunTest.h cmCTestTestHandler.cxx
Log Message:
Merge in changes for RC 3
Index: cmCTestRunTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestRunTest.cxx,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C 2 -d -r1.22.2.1 -r1.22.2.2
*** cmCTestRunTest.cxx 1 Oct 2009 21:21:12 -0000 1.22.2.1
--- cmCTestRunTest.cxx 9 Oct 2009 20:11:27 -0000 1.22.2.2
***************
*** 298,304 ****
//----------------------------------------------------------------------
// Starts the execution of a test. Returns once it has started
! bool cmCTestRunTest::StartTest()
{
! cmCTestLog(this->CTest, HANDLER_OUTPUT, " Start "
<< this->TestProperties->Index << ": "
<< this->TestProperties->Name << std::endl);
--- 298,306 ----
//----------------------------------------------------------------------
// Starts the execution of a test. Returns once it has started
! bool cmCTestRunTest::StartTest(size_t total)
{
! cmCTestLog(this->CTest, HANDLER_OUTPUT, std::setw(2*getNumWidth(total) + 8)
! << "Start "
! << std::setw(getNumWidth(total))
<< this->TestProperties->Index << ": "
<< this->TestProperties->Name << std::endl);
Index: cmCTestMultiProcessHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.cxx,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -C 2 -d -r1.25.2.2 -r1.25.2.3
*** cmCTestMultiProcessHandler.cxx 1 Oct 2009 21:21:12 -0000 1.25.2.2
--- cmCTestMultiProcessHandler.cxx 9 Oct 2009 20:11:27 -0000 1.25.2.3
***************
*** 82,86 ****
testRun->SetIndex(test);
testRun->SetTestProperties(this->Properties[test]);
! if(testRun->StartTest())
{
this->RunningTests.insert(testRun);
--- 82,86 ----
testRun->SetIndex(test);
testRun->SetTestProperties(this->Properties[test]);
! if(testRun->StartTest(this->Total))
{
this->RunningTests.insert(testRun);
***************
*** 252,256 ****
this->RunningTests.erase(p);
this->WriteCheckpoint(test);
! this->WriteCostData(test, p->GetTestResults().ExecutionTime);
this->RunningCount -= GetProcessorsUsed(test);
delete p;
--- 252,257 ----
this->RunningTests.erase(p);
this->WriteCheckpoint(test);
! this->WriteCostData(test, static_cast<float>(
! p->GetTestResults().ExecutionTime));
this->RunningCount -= GetProcessorsUsed(test);
delete p;
***************
*** 277,281 ****
int index = atoi(parts[0].c_str());
! float cost = atof(parts[1].c_str());
if(this->Properties[index] && this->Properties[index]->Cost == 0)
{
--- 278,282 ----
int index = atoi(parts[0].c_str());
! float cost = static_cast<float>(atof(parts[1].c_str()));
if(this->Properties[index] && this->Properties[index]->Cost == 0)
{
Index: cmCTestCoverageHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageHandler.cxx,v
retrieving revision 1.72.2.1
retrieving revision 1.72.2.2
diff -C 2 -d -r1.72.2.1 -r1.72.2.2
*** cmCTestCoverageHandler.cxx 1 Oct 2009 21:21:12 -0000 1.72.2.1
--- cmCTestCoverageHandler.cxx 9 Oct 2009 20:11:26 -0000 1.72.2.2
***************
*** 362,368 ****
cmSystemTools::ConvertToUnixSlashes(binaryDir);
- std::string asfGlob = sourceDir + "/*";
- std::string abfGlob = binaryDir + "/*";
-
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Performing coverage" << std::endl);
--- 362,365 ----
***************
*** 1591,1595 ****
this->CTest->GetShortPathToFile(file.c_str());
! float cper = percentBranch + percentFunction;
if(totalBranches > 0)
{
--- 1588,1592 ----
this->CTest->GetShortPathToFile(file.c_str());
! float cper = static_cast<float>(percentBranch + percentFunction);
if(totalBranches > 0)
{
***************
*** 1597,1601 ****
}
percent_coverage += cper;
! float cmet = percentFunction + percentBranch;
if(totalBranches > 0)
{
--- 1594,1598 ----
}
percent_coverage += cper;
! float cmet = static_cast<float>(percentFunction + percentBranch);
if(totalBranches > 0)
{
Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.120.2.1
retrieving revision 1.120.2.2
diff -C 2 -d -r1.120.2.1 -r1.120.2.2
*** cmCTestTestHandler.cxx 1 Oct 2009 21:21:13 -0000 1.120.2.1
--- cmCTestTestHandler.cxx 9 Oct 2009 20:11:27 -0000 1.120.2.2
***************
*** 575,588 ****
}
! float percent = float(passed.size()) * 100.0f / total;
if ( failed.size() > 0 && percent > 99)
{
percent = 99;
}
!
cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl
<< static_cast<int>(percent + .5) << "% tests passed, "
! << failed.size() << " tests failed out of "
! << total << std::endl);
if(this->CTest->GetLabelSummary())
{
--- 575,588 ----
}
! float percent = float(passed.size()) * 100.0f / float(total);
if ( failed.size() > 0 && percent > 99)
{
percent = 99;
}
!
cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl
<< static_cast<int>(percent + .5) << "% tests passed, "
! << failed.size() << " tests failed out of "
! << total << std::endl);
if(this->CTest->GetLabelSummary())
{
***************
*** 597,601 ****
{
cmGeneratedFileStream ofs;
! cmCTestLog(this->CTest, ERROR_MESSAGE, std::endl
<< "The following tests FAILED:" << std::endl);
this->StartLogFile("TestsFailed", ofs);
--- 597,601 ----
{
cmGeneratedFileStream ofs;
! cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl
<< "The following tests FAILED:" << std::endl);
this->StartLogFile("TestsFailed", ofs);
***************
*** 1983,1987 ****
if ( key == "COST" )
{
! rtit->Cost = atof(val.c_str());
}
if ( key == "RUN_SERIAL" )
--- 1983,1987 ----
if ( key == "COST" )
{
! rtit->Cost = static_cast<float>(atof(val.c_str()));
}
if ( key == "RUN_SERIAL" )
Index: cmCTestRunTest.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestRunTest.h,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C 2 -d -r1.11.2.1 -r1.11.2.2
*** cmCTestRunTest.h 1 Oct 2009 21:21:12 -0000 1.11.2.1
--- cmCTestRunTest.h 9 Oct 2009 20:11:27 -0000 1.11.2.2
***************
*** 47,51 ****
//launch the test process, return whether it started correctly
! bool StartTest();
//capture and report the test results
bool EndTest(size_t completed, size_t total, bool started);
--- 47,51 ----
//launch the test process, return whether it started correctly
! bool StartTest(size_t total);
//capture and report the test results
bool EndTest(size_t completed, size_t total, bool started);
Index: cmCTestBuildHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildHandler.cxx,v
retrieving revision 1.75.2.1
retrieving revision 1.75.2.2
diff -C 2 -d -r1.75.2.1 -r1.75.2.2
*** cmCTestBuildHandler.cxx 1 Oct 2009 21:21:12 -0000 1.75.2.1
--- cmCTestBuildHandler.cxx 9 Oct 2009 20:11:25 -0000 1.75.2.2
***************
*** 597,602 ****
// only report the first 50 warnings and first 50 errors
! unsigned short numErrorsAllowed = this->MaxErrors;
! unsigned short numWarningsAllowed = this->MaxWarnings;
std::string srcdir = this->CTest->GetCTestConfiguration("SourceDirectory");
// make sure the source dir is in the correct case on windows
--- 597,602 ----
// only report the first 50 warnings and first 50 errors
! int numErrorsAllowed = this->MaxErrors;
! int numWarningsAllowed = this->MaxWarnings;
std::string srcdir = this->CTest->GetCTestConfiguration("SourceDirectory");
// make sure the source dir is in the correct case on windows
More information about the Cmake-commits
mailing list