diff options
| author | Craig Scott <craig.scott@crascit.com> | 2019-12-29 00:02:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-29 00:03:00 (GMT) |
| commit | da9cbeb3e93a747afd6880a09e99f80988de097b (patch) | |
| tree | 0655b52ed3f524b192840c2e099c53bd093ca50c /Tests/RunCMake/CTestResourceAllocation | |
| parent | 35cc607249252bd0ef813a4a235eb98d6bf5b370 (diff) | |
| parent | b393b32b4bb0bc830edc89df6262ad710cd0a3e2 (diff) | |
| download | CMake-da9cbeb3e93a747afd6880a09e99f80988de097b.zip CMake-da9cbeb3e93a747afd6880a09e99f80988de097b.tar.gz CMake-da9cbeb3e93a747afd6880a09e99f80988de097b.tar.bz2 | |
Merge topic 'ctest-resource-allocation-spec-message'
b393b32b4b CTest: Improve error handling when reading resource spec file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4162
Diffstat (limited to 'Tests/RunCMake/CTestResourceAllocation')
| -rw-r--r-- | Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx b/Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx index 27644af..80db05e 100644 --- a/Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx +++ b/Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx @@ -285,7 +285,8 @@ static int doVerify(int argc, char const* const* argv) std::set<std::string> testNameSet(testNameList.begin(), testNameList.end()); cmCTestResourceSpec spec; - if (!spec.ReadFromJSONFile(resFile)) { + if (spec.ReadFromJSONFile(resFile) != + cmCTestResourceSpec::ReadFileResult::READ_OK) { std::cout << "Could not read resource spec " << resFile << std::endl; return 1; } |