diff options
author | Brad King <brad.king@kitware.com> | 2021-04-14 16:15:54 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-04-14 17:14:09 (GMT) |
commit | ec1b6157cbfefdcac5c971021a5700dd80318a09 (patch) | |
tree | cf77e28ebb95ce81ec4fa7b91c674bfe62b378cd /Source/CTest | |
parent | eef585efaa49d546a9af2939a147c971c76de03e (diff) | |
download | CMake-ec1b6157cbfefdcac5c971021a5700dd80318a09.zip CMake-ec1b6157cbfefdcac5c971021a5700dd80318a09.tar.gz CMake-ec1b6157cbfefdcac5c971021a5700dd80318a09.tar.bz2 |
Update CMake code using KWSys to account for Status return values
KWSys as of 2021-04-14 changed the return type of `SystemTools`
operations from `bool` to `Status`. Update our call sites.
This may improve error reporting accuracy in a few places.
Diffstat (limited to 'Source/CTest')
-rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index ff0b179..d2cad39 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -921,7 +921,7 @@ bool cmCTestScriptHandler::TryToRemoveBinaryDirectoryOnce( } } - return cmSystemTools::RemoveADirectory(directoryPath); + return static_cast<bool>(cmSystemTools::RemoveADirectory(directoryPath)); } cmDuration cmCTestScriptHandler::GetRemainingTimeAllowed() diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 742e78a..db5cb9c 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1881,7 +1881,7 @@ void cmCTestTestHandler::ExpandTestsToRunInformationForRerunFailed() std::string dirName = this->CTest->GetBinaryDir() + "/Testing/Temporary"; cmsys::Directory directory; - if (directory.Load(dirName) == 0) { + if (!directory.Load(dirName)) { cmCTestLog(this->CTest, ERROR_MESSAGE, "Unable to read the contents of " << dirName << std::endl); return; |