diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-07 16:10:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-11-07 19:14:36 (GMT) |
| commit | 42d5d8f425e655a07d3dcb0802d90cb5c167b164 (patch) | |
| tree | 98782abb4391feb4d7a5d87dd178c456804cbf93 | |
| parent | ed65b3e984ccce9b915a5a71e5a8d13b892b63d8 (diff) | |
| download | CMake-42d5d8f425e655a07d3dcb0802d90cb5c167b164.zip CMake-42d5d8f425e655a07d3dcb0802d90cb5c167b164.tar.gz CMake-42d5d8f425e655a07d3dcb0802d90cb5c167b164.tar.bz2 | |
cmCTestMultiProcessHandler: Hold repeat mode as a member
| -rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 6 | ||||
| -rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.h | 10 | ||||
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index 992a2ef..04abf98 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -171,9 +171,9 @@ bool cmCTestMultiProcessHandler::StartTestProcess(int test) this->RunningCount += GetProcessorsUsed(test); cmCTestRunTest* testRun = new cmCTestRunTest(*this); - if (this->CTest->GetRepeatMode() != cmCTest::Repeat::Never) { - testRun->SetRepeatMode(this->CTest->GetRepeatMode()); - testRun->SetNumberOfRuns(this->CTest->GetRepeatCount()); + if (this->RepeatMode != cmCTest::Repeat::Never) { + testRun->SetRepeatMode(this->RepeatMode); + testRun->SetNumberOfRuns(this->RepeatCount); } testRun->SetIndex(test); testRun->SetTestProperties(this->Properties[test]); diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h index 1db4bfd..4837401 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.h +++ b/Source/CTest/cmCTestMultiProcessHandler.h @@ -14,11 +14,11 @@ #include "cm_uv.h" +#include "cmCTest.h" #include "cmCTestResourceAllocator.h" #include "cmCTestTestHandler.h" #include "cmUVHandlePtr.h" -class cmCTest; struct cmCTestBinPackerAllocation; class cmCTestResourceSpec; class cmCTestRunTest; @@ -85,6 +85,12 @@ public: cmCTestTestHandler* GetTestHandler() { return this->TestHandler; } + void SetRepeatMode(cmCTest::Repeat mode, int count) + { + this->RepeatMode = mode; + this->RepeatCount = count; + } + void SetQuiet(bool b) { this->Quiet = b; } void InitResourceAllocator(const cmCTestResourceSpec& spec) @@ -179,6 +185,8 @@ protected: cmCTestTestHandler* TestHandler; cmCTest* CTest; bool HasCycles; + cmCTest::Repeat RepeatMode = cmCTest::Repeat::Never; + int RepeatCount = 1; bool Quiet; bool SerialTestRunning; }; diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 8e3ac22..9a06083 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1231,6 +1231,8 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<std::string>& passed, parallel->SetCTest(this->CTest); parallel->SetParallelLevel(this->CTest->GetParallelLevel()); parallel->SetTestHandler(this); + parallel->SetRepeatMode(this->CTest->GetRepeatMode(), + this->CTest->GetRepeatCount()); parallel->SetQuiet(this->Quiet); if (this->TestLoad > 0) { parallel->SetTestLoad(this->TestLoad); |