diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-11 12:18:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-11 12:18:08 (GMT) |
| commit | bb59e362cca795543a551f765fb8d39c0236df45 (patch) | |
| tree | df094103d75d0c01443bffe7fabc046b3a916d11 /Source/cmCTest.cxx | |
| parent | c669b59095bf01ab0e254949989677496946ec08 (diff) | |
| parent | 09f0325eaffb6b32b570e3339aa8b8332350b31d (diff) | |
| download | CMake-bb59e362cca795543a551f765fb8d39c0236df45.zip CMake-bb59e362cca795543a551f765fb8d39c0236df45.tar.gz CMake-bb59e362cca795543a551f765fb8d39c0236df45.tar.bz2 | |
Merge topic 'fix-ctest_start-track'
09f0325eaf CTest: Fix regression in ctest_start()
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2366
Diffstat (limited to 'Source/cmCTest.cxx')
| -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 e847bae..6639787 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -476,11 +476,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(); |