3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed stream name from config

Browse Source
This commit is contained in:
Phil Nash 2013-05-29 19:06:25 +01:00
parent 3f184e22e8
commit 40e529740c
5 changed files with 323 additions and 419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/catch_runner.hpp
View File

@ -76,9 +76,6 @@ namespace Catch {
private: private:
void openStream() { void openStream() {
if( !m_config->getStreamName().empty() )
m_config->useStream( m_config->getStreamName() );
// Open output file, if specified // Open output file, if specified
if( !m_config->getFilename().empty() ) { if( !m_config->getFilename().empty() ) {
m_ofs.open( m_config->getFilename().c_str() ); m_ofs.open( m_config->getFilename().c_str() );

5
include/internal/catch_commandline.hpp
View File

@ -413,10 +413,7 @@ namespace Catch {
"OutputDebugString is supported)."; "OutputDebugString is supported).";
} }
virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) { virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) {
if( cmd[0][0] == '%' ) config.outputFilename = cmd[0];
config.stream = cmd[0].substr( 1 );
else
config.outputFilename = cmd[0];
} }
}; };

4
include/internal/catch_config.hpp
View File

@ -69,8 +69,6 @@ namespace Catch {
std::string name; std::string name;
std::vector<std::string> testsOrTags; std::vector<std::string> testsOrTags;
std::string stream;
}; };
@ -142,8 +140,6 @@ namespace Catch {
m_stream = stream; m_stream = stream;
} }
std::string getStreamName() const { return m_data.stream; }
std::string getReporterName() const { return m_data.reporter; } std::string getReporterName() const { return m_data.reporter; }
void addTestSpec( std::string const& testSpec ) { void addTestSpec( std::string const& testSpec ) {

720
projects/SelfTest/Baselines/approvedResults.txt
View File

File diff suppressed because it is too large Load Diff

10
projects/SelfTest/TestMain.cpp
View File

@ -256,20 +256,12 @@ TEST_CASE( "selftest/parser/2", "ConfigData" ) {
} }
} }
SECTION( "streams", "" ) { SECTION( "output filename", "" ) {
SECTION( "-o filename", "" ) { SECTION( "-o filename", "" ) {
const char* argv[] = { "test", "-o", "filename.ext" }; const char* argv[] = { "test", "-o", "filename.ext" };
CHECK_NOTHROW( parseIntoConfig( argv, config ) ); CHECK_NOTHROW( parseIntoConfig( argv, config ) );
REQUIRE( config.outputFilename == "filename.ext" ); REQUIRE( config.outputFilename == "filename.ext" );
REQUIRE( config.stream.empty() );
}
SECTION( "-o %stdout", "" ) {
const char* argv[] = { "test", "-o", "%stdout" };
CHECK_NOTHROW( parseIntoConfig( argv, config ) );
REQUIRE( config.stream == "stdout" );
REQUIRE( config.outputFilename.empty() );
} }
SECTION( "--out", "" ) { SECTION( "--out", "" ) {
const char* argv[] = { "test", "--out", "filename.ext" }; const char* argv[] = { "test", "--out", "filename.ext" };