From 81cc3de28e2245f0fa9aa017aed9aa120e87cb23 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 12 Apr 2019 12:07:31 -0400 Subject: ctest: drop incremental progress-only messages from build-and-test output The cmake progress callback is called with non-negative progress values to provide incremental updates on "Configuring" and "Generating" steps. These are useful in interactive views but are just noise in test output. --- Source/CTest/cmCTestBuildAndTestHandler.cxx | 7 ++++--- 1 file 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() -- cgit v0.12