diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2021-07-28 13:43:04 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2021-07-28 13:58:28 (GMT) |
| commit | 26170ea3069238bfb287d6304cd2f65e1c3a7387 (patch) | |
| tree | 09194a58abaee92019cd3c878fc36621341ec808 /Source | |
| parent | f7cf69e34a1607e8ea2b6d10fef6a6058377c24e (diff) | |
| download | CMake-26170ea3069238bfb287d6304cd2f65e1c3a7387.zip CMake-26170ea3069238bfb287d6304cd2f65e1c3a7387.tar.gz CMake-26170ea3069238bfb287d6304cd2f65e1c3a7387.tar.bz2 | |
CTest: Reset multi-options to persistent multi-options
44ad3f0b added multi-options to CTest, but didn't reset them,
causing ctest_test() to fail if it was run multiple times with
different label arguments. Reset the multi-options.
Fixes: #22485
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) |