diff options
author | Zach Mullen <zach.mullen@kitware.com> | 2009-09-10 15:16:08 (GMT) |
---|---|---|
committer | Zach Mullen <zach.mullen@kitware.com> | 2009-09-10 15:16:08 (GMT) |
commit | 4b4e801eba8efe6da7407ec3364b3fd04eb59e81 (patch) | |
tree | 27fe0619d1452a622ede1975dcd2a2b55a00ec75 /Source/CTest/cmCTestMultiProcessHandler.cxx | |
parent | 55e4ac5ad1344d7636248803f581e72a7dc37a48 (diff) | |
download | CMake-4b4e801eba8efe6da7407ec3364b3fd04eb59e81.zip CMake-4b4e801eba8efe6da7407ec3364b3fd04eb59e81.tar.gz CMake-4b4e801eba8efe6da7407ec3364b3fd04eb59e81.tar.bz2 |
BUG: Fixed segfault and bad reporting if a ctest executable could not be found. Also added some batch testing code that is not yet complete.
Diffstat (limited to 'Source/CTest/cmCTestMultiProcessHandler.cxx')
-rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index 637c2d5..bebaf1e 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -27,6 +27,11 @@ cmCTestMultiProcessHandler::cmCTestMultiProcessHandler() this->Completed = 0; this->RunningCount = 0; } + +cmCTestMultiProcessHandler::~cmCTestMultiProcessHandler() +{ +} + // Set the tests void cmCTestMultiProcessHandler::SetTests(TestMap& tests, @@ -55,11 +60,6 @@ void cmCTestMultiProcessHandler::SetParallelLevel(size_t level) //--------------------------------------------------------- void cmCTestMultiProcessHandler::RunTests() { - if(this->CTest->GetBatchJobs()) - { - this->SubmitBatchTests(); - return; - } this->CheckResume(); this->TestHandler->SetMaxIndex(this->FindMaxIndex()); this->StartNextTests(); @@ -76,18 +76,6 @@ void cmCTestMultiProcessHandler::RunTests() } //--------------------------------------------------------- -void cmCTestMultiProcessHandler::SubmitBatchTests() -{ - for(cmCTest::CTestConfigurationMap::iterator i = - this->CTest->CTestConfiguration.begin(); - i != this->CTest->CTestConfiguration.end(); ++i) - { - cmCTestLog(this->CTest, HANDLER_OUTPUT, i->first - << " = " << i->second << std::endl); - } -} - -//--------------------------------------------------------- void cmCTestMultiProcessHandler::StartTestProcess(int test) { cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "test " << test << "\n"); |