commit d38d7747fe91db4753e9aa26e9b7dd8d065e1cdc
author Brad King <brad.king@kitware.com> Mon Apr 15 14:55:43 2019 +0000
committer Kitware Robot <kwrobot@kitware.com> Mon Apr 15 10:55:53 2019 -0400
tree 06540a7e0a234a860b79f3a04c406e83019a484d
parent 8905f04a1d17dbec61a8be29ac37da223222c005
parent 81cc3de28e2245f0fa9aa017aed9aa120e87cb23

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

Source/CTest/cmCTestBuildAndTestHandler.cxx

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 @@
     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()