From b87bff21cd6b5bb095bddc9db2b99ffae65681d8 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Mon, 14 Mar 2011 08:50:25 +0000 Subject: [PATCH] Added newlines to warn & info - and always output cout & cerr --- catch_reporter_basic.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/catch_reporter_basic.hpp b/catch_reporter_basic.hpp index 2337458..72843f2 100644 --- a/catch_reporter_basic.hpp +++ b/catch_reporter_basic.hpp @@ -195,10 +195,10 @@ namespace Catch m_config.stream() << " exception with message: '" << resultInfo.getMessage() << "'"; break; case ResultWas::Info: - m_config.stream() << "info: '" << resultInfo.getMessage() << "'"; + m_config.stream() << "info:\n'" << resultInfo.getMessage() << "'"; break; case ResultWas::Warning: - m_config.stream() << "warning: '" << resultInfo.getMessage() << "'"; + m_config.stream() << "warning:\n'" << resultInfo.getMessage() << "'"; break; case ResultWas::ExplicitFailure: m_config.stream() << "failed with message: '" << resultInfo.getMessage() << "'"; @@ -224,14 +224,14 @@ namespace Catch const std::string& stdErr ) { + if( !stdOut.empty() ) + m_config.stream() << "[stdout: " << trim( stdOut ) << "]\n"; + + if( !stdErr.empty() ) + m_config.stream() << "[stderr: " << trim( stdErr ) << "]\n"; + if( m_testSpan.emitted ) { - if( !stdOut.empty() ) - m_config.stream() << "[stdout: " << trim( stdOut ) << "]\n"; - - if( !stdErr.empty() ) - m_config.stream() << "[stderr: " << trim( stdErr ) << "]\n"; - m_config.stream() << "[Finished: " << testInfo.getName() << " "; ReportCounts( succeeded, failed ); m_config.stream() << "]" << std::endl;