diff options
| author | Sam Freed <safreed@microsoft.com> | 2021-02-12 19:49:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-02-15 15:52:32 (GMT) |
| commit | 7fd6bb6895c3c280dd73a76de05d0679ff0982a6 (patch) | |
| tree | a44ef699461a7a7fc7c1fb2e2fce0bfde0e32afc /Source | |
| parent | 7f2203ab4ad131e831b0574bb79a0ccb65126b14 (diff) | |
| download | CMake-7fd6bb6895c3c280dd73a76de05d0679ff0982a6.zip CMake-7fd6bb6895c3c280dd73a76de05d0679ff0982a6.tar.gz CMake-7fd6bb6895c3c280dd73a76de05d0679ff0982a6.tar.bz2 | |
presets: Remove unintended rerunFailed option from test presets
This was accidentally included after discussion in #21391 had decided to
leave it out. It was never included in a release.
Issue: #21391
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCMakePresetsFile.cxx | 3 | ||||
| -rw-r--r-- | Source/cmCMakePresetsFile.h | 1 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 5 |
3 files changed, 0 insertions, 9 deletions
diff --git a/Source/cmCMakePresetsFile.cxx b/Source/cmCMakePresetsFile.cxx index e5557e6..673cb65 100644 --- a/Source/cmCMakePresetsFile.cxx +++ b/Source/cmCMakePresetsFile.cxx @@ -631,8 +631,6 @@ auto const TestPresetExecutionHelper = PresetOptionalIntHelper, false) .Bind("showOnly"_s, &TestPreset::ExecutionOptions::ShowOnly, TestPresetOptionalExecutionShowOnlyHelper, false) - .Bind("rerunFailed"_s, &TestPreset::ExecutionOptions::RerunFailed, - PresetOptionalBoolHelper, false) .Bind("repeat"_s, &TestPreset::ExecutionOptions::Repeat, TestPresetOptionalExecutionRepeatHelper, false) .Bind("interactiveDebugging"_s, @@ -1340,7 +1338,6 @@ cmCMakePresetsFile::TestPreset::VisitPresetInherit( parentExecution.ResourceSpecFile); InheritOptionalValue(execution.TestLoad, parentExecution.TestLoad); InheritOptionalValue(execution.ShowOnly, parentExecution.ShowOnly); - InheritOptionalValue(execution.RerunFailed, parentExecution.RerunFailed); InheritOptionalValue(execution.Repeat, parentExecution.Repeat); InheritOptionalValue(execution.InteractiveDebugging, parentExecution.InteractiveDebugging); diff --git a/Source/cmCMakePresetsFile.h b/Source/cmCMakePresetsFile.h index 26810ad..e92c86b 100644 --- a/Source/cmCMakePresetsFile.h +++ b/Source/cmCMakePresetsFile.h @@ -255,7 +255,6 @@ public: std::string ResourceSpecFile; cm::optional<int> TestLoad; cm::optional<ShowOnlyEnum> ShowOnly; - cm::optional<bool> RerunFailed; cm::optional<RepeatOptions> Repeat; cm::optional<bool> InteractiveDebugging; diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 4bea0d5..e8d7c05 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -2501,11 +2501,6 @@ bool cmCTest::SetArgsFromPreset(const std::string& presetName, } } - if (expandedPreset->Execution->RerunFailed.value_or(false)) { - this->GetTestHandler()->SetPersistentOption("RerunFailed", "true"); - this->GetMemCheckHandler()->SetPersistentOption("RerunFailed", "true"); - } - if (expandedPreset->Execution->Repeat) { this->Impl->RepeatCount = expandedPreset->Execution->Repeat->Count; switch (expandedPreset->Execution->Repeat->Mode) { |