summaryrefslogtreecommitdiffstats
path: root/Source/cmCTest.cxx
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2021-12-21 19:39:04 (GMT)
committerKyle Edwards <kyle.edwards@kitware.com>2022-01-06 23:52:30 (GMT)
commitfd6ea2f67fc5fd1aee27ae92d6a16bc0fba1209e (patch)
treec4dbf6fc64a862facea8948d350df173393a2629 /Source/cmCTest.cxx
parent13e71b7c3ec9351f0c25656e72c1c0199ddf771c (diff)
downloadCMake-fd6ea2f67fc5fd1aee27ae92d6a16bc0fba1209e.zip
CMake-fd6ea2f67fc5fd1aee27ae92d6a16bc0fba1209e.tar.gz
CMake-fd6ea2f67fc5fd1aee27ae92d6a16bc0fba1209e.tar.bz2
Refactor: Rename cmCMakePresetsFile to cmCMakePresetsGraph
And change all references to "file" to say "graph" instead.
Diffstat (limited to 'Source/cmCTest.cxx')
-rw-r--r--Source/cmCTest.cxx34
1 files changed, 17 insertions, 17 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 647dd87..a1e920e 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -38,7 +38,7 @@
# include <unistd.h> // IWYU pragma: keep
#endif
-#include "cmCMakePresetsFile.h"
+#include "cmCMakePresetsGraph.h"
#include "cmCTestBuildAndTestHandler.h"
#include "cmCTestBuildHandler.h"
#include "cmCTestConfigureHandler.h"
@@ -2327,12 +2327,12 @@ bool cmCTest::SetArgsFromPreset(const std::string& presetName,
{
const auto workingDirectory = cmSystemTools::GetCurrentWorkingDirectory();
- cmCMakePresetsFile settingsFile;
+ cmCMakePresetsGraph settingsFile;
auto result = settingsFile.ReadProjectPresets(workingDirectory);
- if (result != cmCMakePresetsFile::ReadFileResult::READ_OK) {
- cmSystemTools::Error(cmStrCat("Could not read presets from ",
- workingDirectory, ": ",
- cmCMakePresetsFile::ResultToString(result)));
+ if (result != cmCMakePresetsGraph::ReadFileResult::READ_OK) {
+ cmSystemTools::Error(
+ cmStrCat("Could not read presets from ", workingDirectory, ": ",
+ cmCMakePresetsGraph::ResultToString(result)));
return false;
}
@@ -2422,15 +2422,15 @@ bool cmCTest::SetArgsFromPreset(const std::string& presetName,
if (expandedPreset->Output->Verbosity) {
const auto& verbosity = *expandedPreset->Output->Verbosity;
switch (verbosity) {
- case cmCMakePresetsFile::TestPreset::OutputOptions::VerbosityEnum::
+ case cmCMakePresetsGraph::TestPreset::OutputOptions::VerbosityEnum::
Extra:
this->Impl->ExtraVerbose = true;
CM_FALLTHROUGH;
- case cmCMakePresetsFile::TestPreset::OutputOptions::VerbosityEnum::
+ case cmCMakePresetsGraph::TestPreset::OutputOptions::VerbosityEnum::
Verbose:
this->Impl->Verbose = true;
break;
- case cmCMakePresetsFile::TestPreset::OutputOptions::VerbosityEnum::
+ case cmCMakePresetsGraph::TestPreset::OutputOptions::VerbosityEnum::
Default:
default:
// leave default settings
@@ -2548,13 +2548,13 @@ bool cmCTest::SetArgsFromPreset(const std::string& presetName,
this->Impl->ShowOnly = true;
switch (*expandedPreset->Execution->ShowOnly) {
- case cmCMakePresetsFile::TestPreset::ExecutionOptions::ShowOnlyEnum::
+ case cmCMakePresetsGraph::TestPreset::ExecutionOptions::ShowOnlyEnum::
JsonV1:
this->Impl->Quiet = true;
this->Impl->OutputAsJson = true;
this->Impl->OutputAsJsonVersion = 1;
break;
- case cmCMakePresetsFile::TestPreset::ExecutionOptions::ShowOnlyEnum::
+ case cmCMakePresetsGraph::TestPreset::ExecutionOptions::ShowOnlyEnum::
Human:
// intentional fallthrough (human is the default)
default:
@@ -2565,15 +2565,15 @@ bool cmCTest::SetArgsFromPreset(const std::string& presetName,
if (expandedPreset->Execution->Repeat) {
this->Impl->RepeatCount = expandedPreset->Execution->Repeat->Count;
switch (expandedPreset->Execution->Repeat->Mode) {
- case cmCMakePresetsFile::TestPreset::ExecutionOptions::RepeatOptions::
+ case cmCMakePresetsGraph::TestPreset::ExecutionOptions::RepeatOptions::
ModeEnum::UntilFail:
this->Impl->RepeatMode = cmCTest::Repeat::UntilFail;
break;
- case cmCMakePresetsFile::TestPreset::ExecutionOptions::RepeatOptions::
+ case cmCMakePresetsGraph::TestPreset::ExecutionOptions::RepeatOptions::
ModeEnum::UntilPass:
this->Impl->RepeatMode = cmCTest::Repeat::UntilPass;
break;
- case cmCMakePresetsFile::TestPreset::ExecutionOptions::RepeatOptions::
+ case cmCMakePresetsGraph::TestPreset::ExecutionOptions::RepeatOptions::
ModeEnum::AfterTimeout:
this->Impl->RepeatMode = cmCTest::Repeat::AfterTimeout;
break;
@@ -2599,15 +2599,15 @@ bool cmCTest::SetArgsFromPreset(const std::string& presetName,
if (expandedPreset->Execution->NoTestsAction) {
switch (*expandedPreset->Execution->NoTestsAction) {
- case cmCMakePresetsFile::TestPreset::ExecutionOptions::
+ case cmCMakePresetsGraph::TestPreset::ExecutionOptions::
NoTestsActionEnum::Error:
this->Impl->NoTestsMode = cmCTest::NoTests::Error;
break;
- case cmCMakePresetsFile::TestPreset::ExecutionOptions::
+ case cmCMakePresetsGraph::TestPreset::ExecutionOptions::
NoTestsActionEnum::Ignore:
this->Impl->NoTestsMode = cmCTest::NoTests::Ignore;
break;
- case cmCMakePresetsFile::TestPreset::ExecutionOptions::
+ case cmCMakePresetsGraph::TestPreset::ExecutionOptions::
NoTestsActionEnum::Default:
break;
default: