Merge topic 'preset-fixes' into release-3.20

121d602923 presets: Inherit 'quiet' property for test presets
7fd6bb6895 presets: Remove unintended rerunFailed option from test presets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5808

4 files changed, 1 insertions, 14 deletions

diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst
index 9968239..49eb157 100644
--- a/Help/manual/cmake-presets.7.rst
+++ b/Help/manual/cmake-presets.7.rst
@@ -721,11 +721,6 @@ that may contain the following fields:
 
     ``json-v1``
 
-  ``rerunFailed``
-
-    An optional bool. If true, equivalent to passing ``--rerun-failed`` on
-    the command line.
-
   ``repeat``
 
     An optional object specifying how to repeat tests. Equivalent to
diff --git a/Source/cmCMakePresetsFile.cxx b/Source/cmCMakePresetsFile.cxx
index e5557e6..29d5325 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,
@@ -1280,6 +1278,7 @@ cmCMakePresetsFile::TestPreset::VisitPresetInherit(
       InheritOptionalValue(output.Debug, parentOutput.Debug);
       InheritOptionalValue(output.OutputOnFailure,
                            parentOutput.OutputOnFailure);
+      InheritOptionalValue(output.Quiet, parentOutput.Quiet);
       InheritString(output.OutputLogFile, parentOutput.OutputLogFile);
       InheritOptionalValue(output.LabelSummary, parentOutput.LabelSummary);
       InheritOptionalValue(output.SubprojectSummary,
@@ -1340,7 +1339,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) {