Browse Source

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.
Brad King 6 years ago
parent
commit
81cc3de28e
1 changed files with 4 additions and 3 deletions
  1. 4 3
      Source/CTest/cmCTestBuildAndTestHandler.cxx

+ 4 - 3
Source/CTest/cmCTestBuildAndTestHandler.cxx

@@ -126,11 +126,12 @@ public:
     cmSystemTools::SetStdoutCallback([&s](std::string const& m) { s += m; });
     cmSystemTools::SetStdoutCallback([&s](std::string const& m) { s += m; });
     cmSystemTools::SetStderrCallback([&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 += msg;
         s += "\n";
         s += "\n";
-      });
+      }
+    });
   }
   }
 
 
   ~cmCTestBuildAndTestCaptureRAII()
   ~cmCTestBuildAndTestCaptureRAII()