diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-10 18:35:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-10 18:35:59 (GMT) |
| commit | 3eda5cdd939e0bae5241e2286e7524d552ab455c (patch) | |
| tree | 79790a57ef37e1a3bf145549ff96991d42b77f83 /Source | |
| parent | 68f2b471df7687e37ab2a5808585aad76c7c3122 (diff) | |
| parent | 09f0325eaffb6b32b570e3339aa8b8332350b31d (diff) | |
| download | CMake-3eda5cdd939e0bae5241e2286e7524d552ab455c.zip CMake-3eda5cdd939e0bae5241e2286e7524d552ab455c.tar.gz CMake-3eda5cdd939e0bae5241e2286e7524d552ab455c.tar.bz2 | |
Merge branch 'fix-ctest_start-track' into release-3.12
Merge-request: !2366
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCTest.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index d0e668d..bcb754a 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -478,11 +478,13 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command) tag.clear(); } std::string track; - if (cmSystemTools::GetLineFromStream(tfin, track)) { + if (cmSystemTools::GetLineFromStream(tfin, track) && + !this->Parts[PartStart] && !command) { this->SpecificTrack = track; } std::string model; - if (cmSystemTools::GetLineFromStream(tfin, model)) { + if (cmSystemTools::GetLineFromStream(tfin, model) && + !this->Parts[PartStart] && !command) { this->TestModel = GetTestModelFromString(model.c_str()); } tfin.close(); |