Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhil Nash2011-03-14 08:50:25 +0000
committerPhil Nash2011-03-14 08:50:25 +0000
commitb87bff21cd6b5bb095bddc9db2b99ffae65681d8 (patch)
tree2579f67babdefd9777be8aac558011f851c3554a
parentc27e6dc8383ba9008aae2d2f2b6233045ca0beab (diff)
downloadcatch3-b87bff21cd6b5bb095bddc9db2b99ffae65681d8.tar.gz
Added newlines to warn & info - and always output cout & cerr
-rw-r--r--catch_reporter_basic.hpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/catch_reporter_basic.hpp b/catch_reporter_basic.hpp
index 23374583..72843f2f 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( m_testSpan.emitted )
- {
- if( !stdOut.empty() )
- m_config.stream() << "[stdout: " << trim( stdOut ) << "]\n";
+ if( !stdOut.empty() )
+ m_config.stream() << "[stdout: " << trim( stdOut ) << "]\n";
- if( !stdErr.empty() )
- m_config.stream() << "[stderr: " << trim( stdErr ) << "]\n";
+ if( !stdErr.empty() )
+ m_config.stream() << "[stderr: " << trim( stdErr ) << "]\n";
+ if( m_testSpan.emitted )
+ {
m_config.stream() << "[Finished: " << testInfo.getName() << " ";
ReportCounts( succeeded, failed );
m_config.stream() << "]" << std::endl;