diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-09 11:05:08 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-02-09 11:05:08 -0500 |
| commit | 33fa015b4a7ba4b657ac1f4021081bb3490e15cc (patch) | |
| tree | acb588469ded918429783cd8a48f709e2b24cb9e | |
| parent | 340ca27f8d36f0a09382c22130ca8d4f2c030968 (diff) | |
| download | cmake-33fa015b4a7ba4b657ac1f4021081bb3490e15cc.tar.gz | |
CTest: Restore running dashboard client Test step with modified files
Since commit 6a6f1d1edd (CTest: exit nonzero after
message(SEND_ERROR|FATAL_ERROR), 2020-04-03, v3.19.0-rc1~260^2), `ctest`
no longer runs tests if there are errors before the full set of tests is
defined. Such errors were previously treated more like warnings.
The change exposed some cases where we were issuing an error message but
proceeding to run tests anyway. The above commit downgraded one such
case (missing `DartConfiguration.tcl`) to a warning explicitly in order
to restore its former warning-like semantics.
Downgrade the Update step's diagnostic about modified or conflicting
files to a warning for the same reason.
Fixes: #21783
| -rw-r--r-- | Source/CTest/cmCTestUpdateHandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx index f30ba2bd26..57cc02420a 100644 --- a/Source/CTest/cmCTestUpdateHandler.cxx +++ b/Source/CTest/cmCTestUpdateHandler.cxx @@ -240,7 +240,7 @@ int cmCTestUpdateHandler::ProcessHandler() if (localModifications) { xml.Content("Update error: " "There are modified or conflicting files in the repository"); - cmCTestLog(this->CTest, ERROR_MESSAGE, + cmCTestLog(this->CTest, WARNING, " There are modified or conflicting files in the repository" << std::endl); } |