summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-04-12 16:07:31 (GMT)
committerBrad King <brad.king@kitware.com>2019-04-12 16:07:31 (GMT)
commit81cc3de28e2245f0fa9aa017aed9aa120e87cb23 (patch)
tree5ea8343e2b59cd848ed36828224f20b7744d1dc5 /Source
parent7f83e8033bd30ad112989f7dc17840fdf497586b (diff)
downloadCMake-81cc3de28e2245f0fa9aa017aed9aa120e87cb23.zip
CMake-81cc3de28e2245f0fa9aa017aed9aa120e87cb23.tar.gz
CMake-81cc3de28e2245f0fa9aa017aed9aa120e87cb23.tar.bz2
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.
Diffstat (limited to 'Source')
-rw-r--r--Source/CTest/cmCTestBuildAndTestHandler.cxx7
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()