diff options
| author | Martin Duffy <martin.duffy@kitware.com> | 2023-03-22 17:11:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-03-29 14:41:19 (GMT) |
| commit | 19305afd8a2a46925b1a880de68f7be0ad1f3091 (patch) | |
| tree | cdef4417cd852c2a5dd85886df4ff61d7fd2e653 /Source/CTest/cmCTestTestHandler.cxx | |
| parent | 6b08358e17f5b85ad04ab512e4b6e39e989cea35 (diff) | |
| download | CMake-19305afd8a2a46925b1a880de68f7be0ad1f3091.zip CMake-19305afd8a2a46925b1a880de68f7be0ad1f3091.tar.gz CMake-19305afd8a2a46925b1a880de68f7be0ad1f3091.tar.bz2 | |
presets: Improve JSON parser and error messages
Diffstat (limited to 'Source/CTest/cmCTestTestHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 1d509cf..f693ace 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -37,6 +37,7 @@ #include "cmExecutionStatus.h" #include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" +#include "cmJSONState.h" #include "cmMakefile.h" #include "cmState.h" #include "cmStateSnapshot.h" @@ -1346,12 +1347,11 @@ bool cmCTestTestHandler::ProcessDirectory(std::vector<std::string>& passed, } if (!this->ResourceSpecFile.empty()) { this->UseResourceSpec = true; - auto result = this->ResourceSpec.ReadFromJSONFile(this->ResourceSpecFile); - if (result != cmCTestResourceSpec::ReadFileResult::READ_OK) { + if (!this->ResourceSpec.ReadFromJSONFile(this->ResourceSpecFile)) { cmCTestLog(this->CTest, ERROR_MESSAGE, "Could not read/parse resource spec file " << this->ResourceSpecFile << ": " - << cmCTestResourceSpec::ResultToString(result) + << this->ResourceSpec.parseState.GetErrorMessage() << std::endl); return false; } |