Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Passthrough stdout/err in multireporter's partial test end

This should provide the same overall stdout/err, but the new
output should feel "faster" for test cases that are entered
and exited multiple times (e.g. due to generators).
Commit
b5547f2ef6be18f70d2e9638d8f1eb0d8d42d2ba
Author
Martin Hořeňovský ·
Parents
93882f7fab9e

Files · Download .tar.gz

Changes

 src/catch2/reporters/catch_reporter_listening.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/catch2/reporters/catch_reporter_listening.cpp b/src/catch2/reporters/catch_reporter_listening.cpp
index a08e5d59..e89090fb 100644
--- a/src/catch2/reporters/catch_reporter_listening.cpp
+++ b/src/catch2/reporters/catch_reporter_listening.cpp
@@ -136,21 +136,22 @@ namespace Catch {
 
     void ListeningReporter::testCasePartialEnded( TestCaseStats const& testStats,
                                                   uint64_t partNumber ) {
-        // TODO: Fix handling of stderr/stdout?
+        if ( m_preferences.shouldRedirectStdOut &&
+             m_haveNoncapturingReporters ) {
+            if ( !testStats.stdOut.empty() ) {
+                Catch::cout() << testStats.stdOut << std::flush;
+            }
+            if ( !testStats.stdErr.empty() ) {
+                Catch::cerr() << testStats.stdErr << std::flush;
+            }
+        }
+
         for ( auto& reporterish : m_reporterLikes ) {
             reporterish->testCasePartialEnded( testStats, partNumber );
         }
     }
 
     void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        if ( m_preferences.shouldRedirectStdOut && m_haveNoncapturingReporters ) {
-            if ( !testCaseStats.stdOut.empty() ) {
-                Catch::cout() << testCaseStats.stdOut << std::flush;
-            }
-            if ( !testCaseStats.stdErr.empty() ) {
-                Catch::cerr() << testCaseStats.stdErr << std::flush;
-            }
-        }
         for ( auto& reporterish : m_reporterLikes ) {
             reporterish->testCaseEnded( testCaseStats );
         }