diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-15 14:55:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-15 14:55:53 (GMT) |
| commit | d38d7747fe91db4753e9aa26e9b7dd8d065e1cdc (patch) | |
| tree | 06540a7e0a234a860b79f3a04c406e83019a484d /Source | |
| parent | 8905f04a1d17dbec61a8be29ac37da223222c005 (diff) | |
| parent | 81cc3de28e2245f0fa9aa017aed9aa120e87cb23 (diff) | |
| download | CMake-d38d7747fe91db4753e9aa26e9b7dd8d065e1cdc.zip CMake-d38d7747fe91db4753e9aa26e9b7dd8d065e1cdc.tar.gz CMake-d38d7747fe91db4753e9aa26e9b7dd8d065e1cdc.tar.bz2 | |
Merge topic 'ctest-build-and-test-no-progress'
81cc3de28e ctest: drop incremental progress-only messages from build-and-test output
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3225
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestBuildAndTestHandler.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index a7d4455..9ad9669 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -126,11 +126,12 @@ public: cmSystemTools::SetStdoutCallback([&s](std::string const& m) { s += m; }); cmSystemTools::SetStderrCallback([&s](std::string const& m) { s += m; }); - this->CM.SetProgressCallback( - [&s](const std::string& msg, float /*unused*/) { + this->CM.SetProgressCallback([&s](const std::string& msg, float prog) { + if (prog < 0) { s += msg; s += "\n"; - }); + } + }); } ~cmCTestBuildAndTestCaptureRAII() |