3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 12:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Last changes to ConfigData names (for now)

Browse Source
This commit is contained in:
Phil Nash
2013-05-31 08:01:56 +01:00
parent 40e529740c
commit c9f0f55451
4 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_commandline.hpp
View File

@@ -379,7 +379,7 @@ namespace Catch {
}
virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) {
config.reporter = cmd[0];
config.reporterName = cmd[0];
}
};
@@ -530,7 +530,7 @@ namespace Catch {
if( ss.fail() || threshold <= 0 )
cmd.raiseError( "threshold must be a number greater than zero" );
}
config.cutoff = threshold;
config.abortAfter = threshold;
}
};

12
include/internal/catch_config.hpp
View File

@@ -45,7 +45,7 @@ namespace Catch {
shouldDebugBreak( false ),
noThrow( false ),
showHelp( false ),
cutoff( -1 ),
abortAfter( -1 ),
verbosity( Verbosity::Normal ),
warnings( WarnAbout::Nothing )
{}
@@ -59,12 +59,12 @@ namespace Catch {
bool noThrow;
bool showHelp;
int cutoff;
int abortAfter;
Verbosity::Level verbosity;
WarnAbout::What warnings;
std::string reporter;
std::string reporterName;
std::string outputFilename;
std::string name;
@@ -140,16 +140,16 @@ namespace Catch {
m_stream = stream;
}
std::string getReporterName() const { return m_data.reporter; }
std::string getReporterName() const { return m_data.reporterName; }
void addTestSpec( std::string const& testSpec ) {
TestCaseFilters filters( testSpec );
filters.addFilter( TestCaseFilter( testSpec ) );
m_filterSets.push_back( filters );
}
int abortAfter() const {
return m_data.cutoff;
return m_data.abortAfter;
}
std::vector<TestCaseFilters> const& filters() const {