diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-11 13:00:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-11 15:00:48 (GMT) |
| commit | 493388ce48cb4188068c6f0379bb2afa60c0a41a (patch) | |
| tree | 6889955607c65377409721fc2d983cdb565194ab /Source/CTest | |
| parent | bcf258032fe79c75965722f25ec5f76ff472a19c (diff) | |
| download | CMake-493388ce48cb4188068c6f0379bb2afa60c0a41a.zip CMake-493388ce48cb4188068c6f0379bb2afa60c0a41a.tar.gz CMake-493388ce48cb4188068c6f0379bb2afa60c0a41a.tar.bz2 | |
ctest_update: Fix RETURN_VALUE on VCS tool failure (#15610)
Make RETURN_VALUE report -1 if the update command failed as the
documentation claims. Also avoid reporting a ctest script-level failure
if the update command fails because we still correctly administered the
update step.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestUpdateHandler.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx index 8494d28..963e501 100644 --- a/Source/CTest/cmCTestUpdateHandler.cxx +++ b/Source/CTest/cmCTestUpdateHandler.cxx @@ -283,13 +283,13 @@ int cmCTestUpdateHandler::ProcessHandler() { xml.Content("Update command failed:\n"); xml.Content(vc->GetUpdateCommandLine()); - cmCTestLog(this->CTest, ERROR_MESSAGE, " Update command failed: " + cmCTestLog(this->CTest, HANDLER_OUTPUT, " Update command failed: " << vc->GetUpdateCommandLine() << "\n"); } xml.EndElement(); // UpdateReturnStatus xml.EndElement(); // Update xml.EndDocument(); - return numUpdated; + return updated? numUpdated : -1; } //---------------------------------------------------------------------- |