diff options
author | Kyle Edwards <kyle.edwards@kitware.com> | 2018-09-10 15:23:38 (GMT) |
---|---|---|
committer | Kyle Edwards <kyle.edwards@kitware.com> | 2018-09-10 18:31:21 (GMT) |
commit | 09f0325eaffb6b32b570e3339aa8b8332350b31d (patch) | |
tree | 5d4fa50fefca47dc5fe0f4d25b9752c93b316eaa /Source/cmCTest.cxx | |
parent | f478fa633daeb1432805821adddc40730ffd283d (diff) | |
download | CMake-09f0325eaffb6b32b570e3339aa8b8332350b31d.zip CMake-09f0325eaffb6b32b570e3339aa8b8332350b31d.tar.gz CMake-09f0325eaffb6b32b570e3339aa8b8332350b31d.tar.bz2 |
CTest: Fix regression in ctest_start()
The format for the TAG file was changed in 3.12, and the way it was
read caused a regression which changed how the track was decided. This
commit fixes the regression.
Fixes #18347.
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 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(); |