Added newlines to warn & info - and always output cout & cerr

This commit is contained in:
Phil Nash 2011-03-14 08:50:25 +00:00
parent c27e6dc838
commit b87bff21cd

View File

@ -195,10 +195,10 @@ namespace Catch
m_config.stream() << " exception with message: '" << resultInfo.getMessage() << "'"; m_config.stream() << " exception with message: '" << resultInfo.getMessage() << "'";
break; break;
case ResultWas::Info: case ResultWas::Info:
m_config.stream() << "info: '" << resultInfo.getMessage() << "'"; m_config.stream() << "info:\n'" << resultInfo.getMessage() << "'";
break; break;
case ResultWas::Warning: case ResultWas::Warning:
m_config.stream() << "warning: '" << resultInfo.getMessage() << "'"; m_config.stream() << "warning:\n'" << resultInfo.getMessage() << "'";
break; break;
case ResultWas::ExplicitFailure: case ResultWas::ExplicitFailure:
m_config.stream() << "failed with message: '" << resultInfo.getMessage() << "'"; m_config.stream() << "failed with message: '" << resultInfo.getMessage() << "'";
@ -223,8 +223,6 @@ namespace Catch
const std::string& stdOut, const std::string& stdOut,
const std::string& stdErr const std::string& stdErr
) )
{
if( m_testSpan.emitted )
{ {
if( !stdOut.empty() ) if( !stdOut.empty() )
m_config.stream() << "[stdout: " << trim( stdOut ) << "]\n"; m_config.stream() << "[stdout: " << trim( stdOut ) << "]\n";
@ -232,6 +230,8 @@ namespace Catch
if( !stdErr.empty() ) if( !stdErr.empty() )
m_config.stream() << "[stderr: " << trim( stdErr ) << "]\n"; m_config.stream() << "[stderr: " << trim( stdErr ) << "]\n";
if( m_testSpan.emitted )
{
m_config.stream() << "[Finished: " << testInfo.getName() << " "; m_config.stream() << "[Finished: " << testInfo.getName() << " ";
ReportCounts( succeeded, failed ); ReportCounts( succeeded, failed );
m_config.stream() << "]" << std::endl; m_config.stream() << "]" << std::endl;