diff options
author | Zach Mullen <zach.mullen@kitware.com> | 2009-09-04 14:16:06 (GMT) |
---|---|---|
committer | Zach Mullen <zach.mullen@kitware.com> | 2009-09-04 14:16:06 (GMT) |
commit | c6e5dd21fdc0b8f09e5c91d003c1fdd99ebc5e13 (patch) | |
tree | 549b797d799b54b2805e06cd9369b656b5986e72 /Source/CTest/cmCTestTestHandler.cxx | |
parent | 85463b99552b8b361d7e4ff75c860dd63c250123 (diff) | |
download | CMake-c6e5dd21fdc0b8f09e5c91d003c1fdd99ebc5e13.zip CMake-c6e5dd21fdc0b8f09e5c91d003c1fdd99ebc5e13.tar.gz CMake-c6e5dd21fdc0b8f09e5c91d003c1fdd99ebc5e13.tar.bz2 |
Added the test property EXPENSIVE, which denotes that the given test(s) should be started prior to tests that are not marked as such. Also fixed test dependencies, and a few uninitialized variables in cmProcess.
Diffstat (limited to 'Source/CTest/cmCTestTestHandler.cxx')
-rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 34b4192..d57bfa5 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1009,14 +1009,16 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed, << "----------------------------------------------------------" << std::endl; - cmCTestMultiProcessHandler::TestSet depends; cmCTestMultiProcessHandler::TestMap tests; + cmCTestMultiProcessHandler::TestMap expensiveTests; cmCTestMultiProcessHandler::PropertiesMap properties; + for (ListOfTests::iterator it = this->TestList.begin(); it != this->TestList.end(); it ++ ) { cmCTestTestProperties& p = *it; - + cmCTestMultiProcessHandler::TestSet depends; + if(p.Depends.size()) { for(std::vector<std::string>::iterator i = p.Depends.begin(); @@ -1035,8 +1037,12 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed, } tests[it->Index] = depends; properties[it->Index] = &*it; + if(it->Expensive) + { + expensiveTests[it->Index] = depends; + } } - parallel.SetTests(tests, properties); + parallel.SetTests(tests, expensiveTests, properties); parallel.SetPassFailVectors(&passed, &failed); this->TestResults.clear(); parallel.SetTestResults(&this->TestResults); |