Fixed alternate stream bugs

This commit is contained in:
Phil Nash
2012-09-26 18:36:58 +01:00
parent 60fb60f5e0
commit c4160e9ef8
5 changed files with 43 additions and 22 deletions

View File

@@ -26,7 +26,7 @@ namespace Catch {
: m_configWrapper( configWrapper ),
m_config( configWrapper.data() )
{
resolveStream();
openStream();
makeReporter();
}
@@ -78,13 +78,10 @@ namespace Catch {
}
private:
void resolveStream() {
if( !m_config.stream.empty() ) {
if( m_config.stream[0] == '%' )
m_configWrapper.useStream( m_config.stream.substr( 1 ) );
else
m_configWrapper.setFilename( m_config.stream );
}
void openStream() {
if( !m_config.stream.empty() )
m_configWrapper.useStream( m_config.stream );
// Open output file, if specified
if( !m_config.outputFilename.empty() ) {
m_ofs.open( m_config.outputFilename.c_str() );