Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-05-08 22:37:04 +08:00
Code Issues Projects Releases Wiki Activity

Merge topic 'json-errors-filename'

Browse Source 
f134468a98 JSON: Improve JSON error message formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10463
This commit is contained in:
Brad King 2025-03-14 16:16:44 +00:00 committed by Kitware Robot
commit 2604f5d8b3
44 changed files with 80 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CTest/cmCTestMultiProcessHandler.cxx
View File

@ -1668,7 +1668,7 @@ bool cmCTestMultiProcessHandler::InitResourceAllocator(std::string& error)
{ {
if (!this->ResourceSpec.ReadFromJSONFile(this->ResourceSpecFile)) { if (!this->ResourceSpec.ReadFromJSONFile(this->ResourceSpecFile)) {
error = cmStrCat("Could not read/parse resource spec file ", error = cmStrCat("Could not read/parse resource spec file ",
this->ResourceSpecFile, ": ", this->ResourceSpecFile, ":\n",
this->ResourceSpec.parseState.GetErrorMessage()); this->ResourceSpec.parseState.GetErrorMessage());
return false; return false;
} }

2
Source/cmCTest.cxx
View File

@ -1556,7 +1556,7 @@ bool cmCTest::SetArgsFromPreset(std::string const& presetName,
auto result = settingsFile.ReadProjectPresets(workingDirectory); auto result = settingsFile.ReadProjectPresets(workingDirectory);
if (result != true) { if (result != true) {
cmSystemTools::Error(cmStrCat("Could not read presets from ", cmSystemTools::Error(cmStrCat("Could not read presets from ",
workingDirectory, ":", workingDirectory, ":\n",
settingsFile.parseState.GetErrorMessage())); settingsFile.parseState.GetErrorMessage()));
return false; return false;
} }

10
Source/cmInstrumentation.cxx
View File

@ -148,6 +148,16 @@ void cmInstrumentation::ReadJSONQuery(std::string const& file)
auto query = cmInstrumentationQuery(); auto query = cmInstrumentationQuery();
query.ReadJSON(file, this->errorMsg, this->queries, this->hooks, query.ReadJSON(file, this->errorMsg, this->queries, this->hooks,
this->callbacks); this->callbacks);
if (!this->errorMsg.empty()) {
cmSystemTools::Error(cmStrCat(
"Could not load instrumentation queries from ",
cmSystemTools::GetParentDirectory(file), ":\n", this->errorMsg));
}
}
bool cmInstrumentation::HasErrors() const
{
return !this->errorMsg.empty();
} }
void cmInstrumentation::WriteJSONQuery( void cmInstrumentation::WriteJSONQuery(

3
Source/cmInstrumentation.h
View File

@ -53,7 +53,7 @@ public:
int CollectTimingAfterBuild(int ppid); int CollectTimingAfterBuild(int ppid);
void AddHook(cmInstrumentationQuery::Hook hook); void AddHook(cmInstrumentationQuery::Hook hook);
void AddQuery(cmInstrumentationQuery::Query query); void AddQuery(cmInstrumentationQuery::Query query);
std::string errorMsg; bool HasErrors() const;
std::string const& GetCDashDir(); std::string const& GetCDashDir();
private: private:
@ -83,5 +83,6 @@ private:
std::vector<std::string> queryFiles; std::vector<std::string> queryFiles;
std::map<std::string, std::string> cdashSnippetsMap; std::map<std::string, std::string> cdashSnippetsMap;
Json::Value preTestStats; Json::Value preTestStats;
std::string errorMsg;
bool hasQuery = false; bool hasQuery = false;
}; };

23
Source/cmJSONState.cxx
View File

@ -12,12 +12,14 @@
#include "cmsys/FStream.hxx" #include "cmsys/FStream.hxx"
#include "cmStringAlgorithms.h" #include "cmStringAlgorithms.h"
#include "cmSystemTools.h"
cmJSONState::cmJSONState(std::string const& filename, Json::Value* root) cmJSONState::cmJSONState(std::string jsonFile, Json::Value* root)
: Filename(std::move(jsonFile))
{ {
cmsys::ifstream fin(filename.c_str(), std::ios::in | std::ios::binary); cmsys::ifstream fin(this->Filename.c_str(), std::ios::in | std::ios::binary);
if (!fin) { if (!fin) {
this->AddError(cmStrCat("File not found: ", filename)); this->AddError(cmStrCat("File not found: ", this->Filename));
return; return;
} }
// If there's a BOM, toss it. // If there's a BOM, toss it.
@ -38,7 +40,7 @@ cmJSONState::cmJSONState(std::string const& filename, Json::Value* root)
Json::CharReaderBuilder::strictMode(&builder.settings_); Json::CharReaderBuilder::strictMode(&builder.settings_);
std::string errMsg; std::string errMsg;
if (!Json::parseFromStream(builder, fin, root, &errMsg)) { if (!Json::parseFromStream(builder, fin, root, &errMsg)) {
errMsg = cmStrCat("JSON Parse Error: ", filename, ":\n", errMsg); errMsg = cmStrCat("JSON Parse Error: ", this->Filename, ":\n", errMsg);
this->AddError(errMsg); this->AddError(errMsg);
} }
} }
@ -72,16 +74,17 @@ void cmJSONState::AddErrorAtOffset(std::string const& errMsg,
std::string cmJSONState::GetErrorMessage(bool showContext) std::string cmJSONState::GetErrorMessage(bool showContext)
{ {
std::string message; std::string message;
std::string filenameName = cmSystemTools::GetFilenameName(this->Filename);
for (auto const& error : this->errors) { for (auto const& error : this->errors) {
Location loc = error.GetLocation();
if (!filenameName.empty() && loc.line > 0) {
message = cmStrCat(message, filenameName, ':', loc.line, ": ");
}
message = cmStrCat(message, error.GetErrorMessage(), "\n"); message = cmStrCat(message, error.GetErrorMessage(), "\n");
if (showContext) { if (showContext && loc.line > 0) {
Location loc = error.GetLocation(); message = cmStrCat(message, GetJsonContext(loc), "\n");
if (loc.column > 0) {
message = cmStrCat(message, GetJsonContext(loc), "\n");
}
} }
} }
message = cmStrCat("\n", message);
message.pop_back(); message.pop_back();
return message; return message;
} }

15
Source/cmJSONState.h
View File

@ -9,8 +9,6 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "cmStringAlgorithms.h"
namespace Json { namespace Json {
class Value; class Value;
} }
@ -26,7 +24,7 @@ class cmJSONState
public: public:
using JsonPair = std::pair<std::string const, Json::Value const*>; using JsonPair = std::pair<std::string const, Json::Value const*>;
cmJSONState() = default; cmJSONState() = default;
cmJSONState(std::string const& filename, Json::Value* root); cmJSONState(std::string jsonFile, Json::Value* root);
void AddError(std::string const& errMsg); void AddError(std::string const& errMsg);
void AddErrorAtValue(std::string const& errMsg, Json::Value const* value); void AddErrorAtValue(std::string const& errMsg, Json::Value const* value);
void AddErrorAtOffset(std::string const& errMsg, std::ptrdiff_t offset); void AddErrorAtOffset(std::string const& errMsg, std::ptrdiff_t offset);
@ -46,15 +44,7 @@ public:
Error(std::string errMsg) Error(std::string errMsg)
: location({ -1, -1 }) : location({ -1, -1 })
, message(std::move(errMsg)) {}; , message(std::move(errMsg)) {};
std::string GetErrorMessage() const std::string GetErrorMessage() const { return message; }
{
std::string output = message;
if (location.line > 0) {
output = cmStrCat("Error: @", location.line, ",", location.column,
": ", output);
}
return output;
}
Location GetLocation() const { return location; } Location GetLocation() const { return location; }
private: private:
@ -70,4 +60,5 @@ public:
private: private:
std::string GetJsonContext(Location loc); std::string GetJsonContext(Location loc);
Location LocateInDocument(ptrdiff_t offset); Location LocateInDocument(ptrdiff_t offset);
std::string Filename;
}; };

16
Source/cmake.cxx
View File

@ -1540,8 +1540,8 @@ void cmake::SetArgs(std::vector<std::string> const& args)
auto result = presetsGraph.ReadProjectPresets(this->GetHomeDirectory()); auto result = presetsGraph.ReadProjectPresets(this->GetHomeDirectory());
if (result != true) { if (result != true) {
std::string errorMsg = std::string errorMsg =
cmStrCat("Could not read presets from ", this->GetHomeDirectory(), ":", cmStrCat("Could not read presets from ", this->GetHomeDirectory(),
presetsGraph.parseState.GetErrorMessage()); ":\n", presetsGraph.parseState.GetErrorMessage());
cmSystemTools::Error(errorMsg); cmSystemTools::Error(errorMsg);
return; return;
} }
@ -2635,8 +2635,7 @@ int cmake::ActualConfigure()
// actually do the configure // actually do the configure
auto startTime = std::chrono::steady_clock::now(); auto startTime = std::chrono::steady_clock::now();
#if !defined(CMAKE_BOOTSTRAP) #if !defined(CMAKE_BOOTSTRAP)
if (!this->Instrumentation->errorMsg.empty()) { if (this->Instrumentation->HasErrors()) {
cmSystemTools::Error(this->Instrumentation->errorMsg);
return 1; return 1;
} }
auto doConfigure = [this]() -> int { auto doConfigure = [this]() -> int {
@ -3750,8 +3749,8 @@ int cmake::Build(int jobs, std::string dir, std::vector<std::string> targets,
auto result = settingsFile.ReadProjectPresets(this->GetHomeDirectory()); auto result = settingsFile.ReadProjectPresets(this->GetHomeDirectory());
if (result != true) { if (result != true) {
cmSystemTools::Error( cmSystemTools::Error(
cmStrCat("Could not read presets from ", this->GetHomeDirectory(), ":", cmStrCat("Could not read presets from ", this->GetHomeDirectory(),
settingsFile.parseState.GetErrorMessage())); ":\n", settingsFile.parseState.GetErrorMessage()));
return 1; return 1;
} }
@ -3977,8 +3976,7 @@ int cmake::Build(int jobs, std::string dir, std::vector<std::string> targets,
#if !defined(CMAKE_BOOTSTRAP) #if !defined(CMAKE_BOOTSTRAP)
cmInstrumentation instrumentation(dir); cmInstrumentation instrumentation(dir);
if (!instrumentation.errorMsg.empty()) { if (instrumentation.HasErrors()) {
cmSystemTools::Error(instrumentation.errorMsg);
return 1; return 1;
} }
instrumentation.CollectTimingData( instrumentation.CollectTimingData(
@ -4122,7 +4120,7 @@ int cmake::Workflow(std::string const& presetName,
auto result = settingsFile.ReadProjectPresets(this->GetHomeDirectory()); auto result = settingsFile.ReadProjectPresets(this->GetHomeDirectory());
if (result != true) { if (result != true) {
cmSystemTools::Error(cmStrCat("Could not read presets from ", cmSystemTools::Error(cmStrCat("Could not read presets from ",
this->GetHomeDirectory(), ":", this->GetHomeDirectory(), ":\n",
settingsFile.parseState.GetErrorMessage())); settingsFile.parseState.GetErrorMessage()));
return 1; return 1;
} }

2
Tests/CMakeLib/testJSONHelpers.cxx
View File

@ -505,7 +505,7 @@ bool testFilteredObject()
ASSERT_TRUE(m == expected); ASSERT_TRUE(m == expected);
auto error = state.GetErrorMessage(); auto error = state.GetErrorMessage();
ASSERT_TRUE(error == "\nFaulty Object Property"); ASSERT_TRUE(error == "Faulty Object Property");
return true; return true;
} }

2
Tests/RunCMake/CMakePresets/CommentValidOldSchema-stderr.txt
View File

@ -1,2 +1,2 @@
^CMake Error: Could not read presets from .* ^CMake Error: Could not read presets from .*
Error: @2,15: Invalid extra field \"\$comment\" in root object CMakePresets.json:2: Invalid extra field \"\$comment\" in root object

2
Tests/RunCMake/CMakePresets/EmptyPenvInInclude-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/EmptyPenvInInclude: ]*/Tests/RunCMake/CMakePresets/EmptyPenvInInclude:
Error: @3,15: Invalid "include" field CMakePresets.json:3: Invalid "include" field
"include": \["\$penv\{\}"\], "include": \["\$penv\{\}"\],
\^$ \^$

2
Tests/RunCMake/CMakePresets/EmptyPresetName-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/EmptyPresetName: ]*/Tests/RunCMake/CMakePresets/EmptyPresetName:
Error: @5,15: Invalid Preset Name CMakePresets.json:5: Invalid Preset Name
"name": "", "name": "",
\^$ \^$

2
Tests/RunCMake/CMakePresets/ExtraPresetField-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/ExtraPresetField: ]*/Tests/RunCMake/CMakePresets/ExtraPresetField:
Error: @8,18: Invalid extra field "invalid" in Preset CMakePresets.json:8: Invalid extra field "invalid" in Preset
"invalid": true "invalid": true
\^$ \^$

2
Tests/RunCMake/CMakePresets/ExtraRootField-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/ExtraRootField: ]*/Tests/RunCMake/CMakePresets/ExtraRootField:
Error: @10,14: Invalid extra field "invalid" in root object CMakePresets.json:10: Invalid extra field "invalid" in root object
"invalid": true "invalid": true
\^$ \^$

2
Tests/RunCMake/CMakePresets/ExtraVariableField-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/ExtraVariableField: ]*/Tests/RunCMake/CMakePresets/ExtraVariableField:
Error: @11,22: Invalid extra field "invalid" in variable "EXTRA" for preset "ExtraVariableField" CMakePresets.json:11: Invalid extra field "invalid" in variable "EXTRA" for preset "ExtraVariableField"
"invalid": true "invalid": true
\^$ \^$

2
Tests/RunCMake/CMakePresets/HighVersion-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/HighVersion: ]*/Tests/RunCMake/CMakePresets/HighVersion:
Error: @2,14: Unrecognized "version" 1000: must be >=1 and <=10 CMakePresets.json:2: Unrecognized "version" 1000: must be >=1 and <=10
"version": 1000, "version": 1000,
\^$ \^$

2
Tests/RunCMake/CMakePresets/InvalidArchitectureStrategy-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/InvalidArchitectureStrategy: ]*/Tests/RunCMake/CMakePresets/InvalidArchitectureStrategy:
Error: @9,21: Invalid preset CMakePresets.json:9: Invalid preset
"strategy": {} "strategy": {}
\^$ \^$

2
Tests/RunCMake/CMakePresets/InvalidPresetBinaryDir-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/InvalidPresetBinaryDir: ]*/Tests/RunCMake/CMakePresets/InvalidPresetBinaryDir:
Error: @7,20: "binaryDir" expected a string CMakePresets.json:7: "binaryDir" expected a string
"binaryDir": \[\] "binaryDir": \[\]
\^$ \^$

2
Tests/RunCMake/CMakePresets/InvalidPresetGenerator-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/InvalidPresetGenerator: ]*/Tests/RunCMake/CMakePresets/InvalidPresetGenerator:
Error: @6,20: "generator" expected a string CMakePresets.json:6: "generator" expected a string
"generator": \[\], "generator": \[\],
\^$ \^$

2
Tests/RunCMake/CMakePresets/InvalidPresetName-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/InvalidPresetName: ]*/Tests/RunCMake/CMakePresets/InvalidPresetName:
Error: @5,15: Invalid Preset Name CMakePresets.json:5: Invalid Preset Name
"name": \[\], "name": \[\],
\^$ \^$

2
Tests/RunCMake/CMakePresets/InvalidPresetVendor-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/InvalidPresetVendor: ]*/Tests/RunCMake/CMakePresets/InvalidPresetVendor:
Error: @8,17: Invalid preset CMakePresets.json:8: Invalid preset
"vendor": true "vendor": true
\^$ \^$

2
Tests/RunCMake/CMakePresets/InvalidPresets-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/InvalidPresets: ]*/Tests/RunCMake/CMakePresets/InvalidPresets:
Error: @3,23: Invalid "configurePresets" field CMakePresets.json:3: Invalid "configurePresets" field
"configurePresets": {} "configurePresets": {}
\^$ \^$

2
Tests/RunCMake/CMakePresets/InvalidRoot-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/InvalidRoot: ]*/Tests/RunCMake/CMakePresets/InvalidRoot:
Error: \@1\,1\: Invalid root object CMakePresets.json:1: Invalid root object
\[\] \[\]
\^$ \^$

2
Tests/RunCMake/CMakePresets/InvalidToolsetStrategy-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/InvalidToolsetStrategy: ]*/Tests/RunCMake/CMakePresets/InvalidToolsetStrategy:
Error: @9,21: Invalid preset CMakePresets.json:9: Invalid preset
"strategy": {} "strategy": {}
\^$ \^$

2
Tests/RunCMake/CMakePresets/InvalidVariableValue-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/InvalidVariableValue: ]*/Tests/RunCMake/CMakePresets/InvalidVariableValue:
Error: @10,20: "value" expected a string CMakePresets.json:10: "value" expected a string
"value": \[\] "value": \[\]
\^$ \^$

2
Tests/RunCMake/CMakePresets/InvalidVariables-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/InvalidVariables: ]*/Tests/RunCMake/CMakePresets/InvalidVariables:
Error: @8,25: Invalid preset CMakePresets.json:8: Invalid preset
"cacheVariables": \[\] "cacheVariables": \[\]
\^$ \^$

2
Tests/RunCMake/CMakePresets/InvalidVendor-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/InvalidVendor: ]*/Tests/RunCMake/CMakePresets/InvalidVendor:
Error: @3,13: Invalid root object CMakePresets.json:3: Invalid root object
"vendor": true, "vendor": true,
\^$ \^$

2
Tests/RunCMake/CMakePresets/InvalidVersion-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/InvalidVersion: ]*/Tests/RunCMake/CMakePresets/InvalidVersion:
Error: @2,14: Invalid "version" field CMakePresets.json:2: Invalid "version" field
"version": "1.0", "version": "1.0",
\^$ \^$

2
Tests/RunCMake/CMakePresets/LowVersion-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/LowVersion: ]*/Tests/RunCMake/CMakePresets/LowVersion:
Error: @2,14: Unrecognized "version" 0: must be >=1 and <=10 CMakePresets.json:2: Unrecognized "version" 0: must be >=1 and <=10
"version": 0, "version": 0,
\^ \^

2
Tests/RunCMake/CMakePresets/MinimumRequiredInvalid-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/MinimumRequiredInvalid: ]*/Tests/RunCMake/CMakePresets/MinimumRequiredInvalid:
Error: @3,27: Invalid "cmakeMinimumRequired" CMakePresets.json:3: Invalid "cmakeMinimumRequired"
"cmakeMinimumRequired": "3.18", "cmakeMinimumRequired": "3.18",
\^$ \^$

2
Tests/RunCMake/CMakePresets/MinimumRequiredMajor-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/MinimumRequiredMajor: ]*/Tests/RunCMake/CMakePresets/MinimumRequiredMajor:
Error: @4,14: "cmakeMinimumRequired" major version 1000 must be less than [0-9]* CMakePresets.json:4: "cmakeMinimumRequired" major version 1000 must be less than [0-9]*
"major": 1000 "major": 1000
\^$ \^$

2
Tests/RunCMake/CMakePresets/MinimumRequiredMinor-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/MinimumRequiredMinor: ]*/Tests/RunCMake/CMakePresets/MinimumRequiredMinor:
Error: @5,14: "cmakeMinimumRequired" minor version 1000 must be less than [0-9]* CMakePresets.json:5: "cmakeMinimumRequired" minor version 1000 must be less than [0-9]*
"minor": 1000 "minor": 1000
\^$ \^$

2
Tests/RunCMake/CMakePresets/MinimumRequiredPatch-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/MinimumRequiredPatch: ]*/Tests/RunCMake/CMakePresets/MinimumRequiredPatch:
Error: @6,14: "cmakeMinimumRequired" patch version 50000000 must be less than [0-9]* CMakePresets.json:6: "cmakeMinimumRequired" patch version 50000000 must be less than [0-9]*
"patch": 50000000 "patch": 50000000
\^$ \^$

2
Tests/RunCMake/CMakePresets/NoPresetName-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/NoPresetName: ]*/Tests/RunCMake/CMakePresets/NoPresetName:
Error: @4,5: Missing required field "name" in Preset CMakePresets.json:4: Missing required field "name" in Preset
{ {
\^$ \^$

2
Tests/RunCMake/CMakePresets/NoVariableValue-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/NoVariableValue: ]*/Tests/RunCMake/CMakePresets/NoVariableValue:
Error: @9,16: Missing required field "value" in variable "VAR" for preset "NoVariableValue" CMakePresets.json:9: Missing required field "value" in variable "VAR" for preset "NoVariableValue"
"VAR": {} "VAR": {}
\^$ \^$

2
Tests/RunCMake/CMakePresets/PresetNotObject-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/PresetNotObject: ]*/Tests/RunCMake/CMakePresets/PresetNotObject:
Error: @4,5: Invalid Preset CMakePresets.json:4: Invalid Preset
\[\] \[\]
\^$ \^$

2
Tests/RunCMake/CMakePresets/UnknownArchitectureStrategy-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/UnknownArchitectureStrategy: ]*/Tests/RunCMake/CMakePresets/UnknownArchitectureStrategy:
Error: @9,21: Invalid preset CMakePresets.json:9: Invalid preset
"strategy": "unknown" "strategy": "unknown"
\^$ \^$

2
Tests/RunCMake/CMakePresets/UnknownToolsetStrategy-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/UnknownToolsetStrategy: ]*/Tests/RunCMake/CMakePresets/UnknownToolsetStrategy:
Error: @9,21: Invalid preset CMakePresets.json:9: Invalid preset
"strategy": "unknown" "strategy": "unknown"
\^$ \^$

2
Tests/RunCMake/CMakePresets/VariableNotObject-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error: Could not read presets from [^ ^CMake Error: Could not read presets from [^
]*/Tests/RunCMake/CMakePresets/VariableNotObject: ]*/Tests/RunCMake/CMakePresets/VariableNotObject:
Error: @9,16: Invalid CMake variable "VAR" for preset "VariableNotObject" CMakePresets.json:9: Invalid CMake variable "VAR" for preset "VariableNotObject"
"VAR": \[\] "VAR": \[\]
\^$ \^$

2
Tests/RunCMake/CTestResourceAllocation/dynamic-resource-nofile-ctest-s-stderr.txt
View File

@ -1,5 +1,5 @@
^Could not read/parse resource spec file [^ ^Could not read/parse resource spec file [^
]*/Tests/RunCMake/CTestResourceAllocation/dynamic-resource-nofile-ctest-s-build/dynamic-resspec\.json:[ ] ]*/Tests/RunCMake/CTestResourceAllocation/dynamic-resource-nofile-ctest-s-build/dynamic-resspec\.json:
File not found: [^ File not found: [^
]*/Tests/RunCMake/CTestResourceAllocation/dynamic-resource-nofile-ctest-s-build/dynamic-resspec\.json ]*/Tests/RunCMake/CTestResourceAllocation/dynamic-resource-nofile-ctest-s-build/dynamic-resspec\.json
CMake Error at [^ CMake Error at [^

2
Tests/RunCMake/CTestResourceAllocation/invalid-nofile-ctest-stderr.txt
View File

@ -1,5 +1,5 @@
^Could not read/parse resource spec file [^ ^Could not read/parse resource spec file [^
]*/Tests/RunCMake/CTestResourceAllocation/noexist\.json:[ ] ]*/Tests/RunCMake/CTestResourceAllocation/noexist\.json:
File not found: [^ File not found: [^
]*/Tests/RunCMake/CTestResourceAllocation/noexist.json ]*/Tests/RunCMake/CTestResourceAllocation/noexist.json
Errors while running CTest Errors while running CTest

2
Tests/RunCMake/CTestResourceAllocation/invalid-not-json-ctest-stderr.txt
View File

@ -1,5 +1,5 @@
^Could not read/parse resource spec file [^ ^Could not read/parse resource spec file [^
]*/Tests/RunCMake/CTestResourceAllocation/invalid\.json:[ ] ]*/Tests/RunCMake/CTestResourceAllocation/invalid\.json:
JSON Parse Error: [^ JSON Parse Error: [^
]*/Tests/RunCMake/CTestResourceAllocation/invalid\.json: ]*/Tests/RunCMake/CTestResourceAllocation/invalid\.json:
\* Line 1, Column 1 \* Line 1, Column 1

5
Tests/RunCMake/Instrumentation/bad-hook-stderr.txt
View File

@ -1,4 +1,5 @@
^CMake Error: + ^CMake Error: Could not load instrumentation queries from [^
Error: @3,13: Not a valid hook: "bad hook" ]+:
bad-hook.json:3: Not a valid hook: "bad hook"
"hooks": \["bad hook", "postGenerate", "preCMakeBuild", "postCMakeBuild", "postInstall"\] "hooks": \["bad hook", "postGenerate", "preCMakeBuild", "postCMakeBuild", "postInstall"\]
\^$ \^$

5
Tests/RunCMake/Instrumentation/bad-query-stderr.txt
View File

@ -1,4 +1,5 @@
^CMake Error: + ^CMake Error: Could not load instrumentation queries from [^
Error: @3,42: Not a valid query: "bad query" ]+:
bad-query.json:[0-9]+: Not a valid query: "bad query"
"queries": \["staticSystemInformation", "bad query"\] "queries": \["staticSystemInformation", "bad query"\]
\^$ \^$

5
Tests/RunCMake/Instrumentation/empty-stderr.txt
View File

@ -1,4 +1,5 @@
^CMake Error: + ^CMake Error: Could not load instrumentation queries from [^
Error: @1,1: Missing required field "version" in root object ]+:
empty.json:[0-9]+: Missing required field "version" in root object
{ {
\^$ \^$