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

CTest: perform cycle test early

Browse Source
This commit is contained in:
Nils Gladitz 2013-10-19 09:28:18 +02:00
parent 6d4d7ca955
commit 1b750cbf9a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CTest/cmCTestMultiProcessHandler.cxx
View File

@ -41,6 +41,7 @@ cmCTestMultiProcessHandler::cmCTestMultiProcessHandler()
this->Completed = 0; this->Completed = 0;
this->RunningCount = 0; this->RunningCount = 0;
this->StopTimePassed = false; this->StopTimePassed = false;
this->HasCycles = false;
} }
cmCTestMultiProcessHandler::~cmCTestMultiProcessHandler() cmCTestMultiProcessHandler::~cmCTestMultiProcessHandler()
@ -65,6 +66,11 @@ cmCTestMultiProcessHandler::SetTests(TestMap& tests,
if(!this->CTest->GetShowOnly()) if(!this->CTest->GetShowOnly())
{ {
this->ReadCostData(); this->ReadCostData();
this->HasCycles = !this->CheckCycles();
if(this->HasCycles)
{
return;
}
this->CreateTestCostList(); this->CreateTestCostList();
} }
} }
@ -79,7 +85,7 @@ void cmCTestMultiProcessHandler::SetParallelLevel(size_t level)
void cmCTestMultiProcessHandler::RunTests() void cmCTestMultiProcessHandler::RunTests()
{ {
this->CheckResume(); this->CheckResume();
if(!this->CheckCycles()) if(this->HasCycles)
{ {
return; return;
} }

1
Source/CTest/cmCTestMultiProcessHandler.h
View File

@ -111,6 +111,7 @@ protected:
std::set<cmCTestRunTest*> RunningTests; // current running tests std::set<cmCTestRunTest*> RunningTests; // current running tests
cmCTestTestHandler * TestHandler; cmCTestTestHandler * TestHandler;
cmCTest* CTest; cmCTest* CTest;
bool HasCycles;
}; };
#endif #endif