3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't redirect stout for basic reporter

This commit is contained in:
Phil Nash 2012-02-17 09:28:21 +00:00
parent 93b8a39c38
commit a57b025c9c
6 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/catch_runner.hpp
View File

@ -78,6 +78,7 @@ namespace Catch
config.getReporter()->EndGroup( *it, runner.getSuccessCount()-prevSuccess, runner.getFailureCount()-prevFail );
}
}
return static_cast<int>( runner.getFailureCount() );
}

3
include/internal/catch_interfaces_reporter.h
View File

@ -47,6 +47,9 @@ namespace Catch
virtual ~IReporter
(){}
virtual bool shouldRedirectStdout
() const = 0;
virtual void StartTesting
() = 0;

13
include/internal/catch_runner_impl.hpp
View File

@ -585,9 +585,16 @@ namespace Catch
try
{
m_runningTest->reset();
StreamRedirect coutRedir( std::cout, redirectedCout );
StreamRedirect cerrRedir( std::cerr, redirectedCerr );
m_runningTest->getTestCaseInfo().invoke();
if( m_reporter->shouldRedirectStdout() )
{
StreamRedirect coutRedir( std::cout, redirectedCout );
StreamRedirect cerrRedir( std::cerr, redirectedCerr );
m_runningTest->getTestCaseInfo().invoke();
}
else
{
m_runningTest->getTestCaseInfo().invoke();
}
m_runningTest->ranToCompletion();
}
catch( TestFailureException& )

8
include/reporters/catch_reporter_basic.hpp
View File

@ -79,6 +79,14 @@ namespace Catch
private: // IReporter
///////////////////////////////////////////////////////////////////////////
virtual bool shouldRedirectStdout
()
const
{
return false;
}
///////////////////////////////////////////////////////////////////////////
virtual void StartTesting
()

8
include/reporters/catch_reporter_junit.hpp
View File

@ -82,6 +82,14 @@ namespace Catch
private: // IReporter
///////////////////////////////////////////////////////////////////////////
virtual bool shouldRedirectStdout
()
const
{
return true;
}
///////////////////////////////////////////////////////////////////////////
virtual void StartTesting()
{

8
include/reporters/catch_reporter_xml.hpp
View File

@ -40,6 +40,14 @@ namespace Catch
private: // IReporter
///////////////////////////////////////////////////////////////////////////
virtual bool shouldRedirectStdout
()
const
{
return true;
}
///////////////////////////////////////////////////////////////////////////
virtual void StartTesting
()