diff options
| author | Phil Nash | 2013-05-31 08:01:56 +0100 |
|---|---|---|
| committer | Phil Nash | 2013-05-31 08:01:56 +0100 |
| commit | c9f0f554517009d541b015898355bf80aebd747e (patch) | |
| tree | babf7e0c62863c2eb1a71196c026baf895bc1842 /include | |
| parent | 40e529740cc3518de60e2002f3b10afe9b1acd9a (diff) | |
| download | catch3-c9f0f554517009d541b015898355bf80aebd747e.tar.gz | |
Last changes to ConfigData names (for now)
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_commandline.hpp | 4 | ||||
| -rw-r--r-- | include/internal/catch_config.hpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/internal/catch_commandline.hpp b/include/internal/catch_commandline.hpp index 2726827b..af38bfa3 100644 --- a/include/internal/catch_commandline.hpp +++ b/include/internal/catch_commandline.hpp @@ -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; } }; diff --git a/include/internal/catch_config.hpp b/include/internal/catch_config.hpp index 058e3a33..c8b93b01 100644 --- a/include/internal/catch_config.hpp +++ b/include/internal/catch_config.hpp @@ -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 { |