diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-29 12:44:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-29 12:44:27 (GMT) |
| commit | 5f1afff9f79784d59618abc16d8e56a3c5f3f1e3 (patch) | |
| tree | 356a8a776b2040d4c26ff1795b3639660d2647b5 /Source | |
| parent | b880867e5aa4037d5fca4c3aafa82ffe60d18dfa (diff) | |
| parent | 26170ea3069238bfb287d6304cd2f65e1c3a7387 (diff) | |
| download | CMake-5f1afff9f79784d59618abc16d8e56a3c5f3f1e3.zip CMake-5f1afff9f79784d59618abc16d8e56a3c5f3f1e3.tar.gz CMake-5f1afff9f79784d59618abc16d8e56a3c5f3f1e3.tar.bz2 | |
Merge topic 'ctest-test-changing-labels' into release-3.21
26170ea306 CTest: Reset multi-options to persistent multi-options
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6403
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestGenericHandler.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx index cc756d7..48cc0e4 100644 --- a/Source/CTest/cmCTestGenericHandler.cxx +++ b/Source/CTest/cmCTestGenericHandler.cxx @@ -68,10 +68,8 @@ void cmCTestGenericHandler::Initialize() { this->AppendXML = false; this->TestLoad = 0; - this->Options.clear(); - for (auto const& po : this->PersistentOptions) { - this->Options[po.first] = po.second; - } + this->Options = this->PersistentOptions; + this->MultiOptions = this->PersistentMultiOptions; } const char* cmCTestGenericHandler::GetOption(const std::string& op) |