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

Now fully switched over to Clara-based command line with modified args

Browse Source
This commit is contained in:
Phil Nash
2013-06-04 08:37:28 +01:00
parent 130ec986c7
commit aee9b75e37
7 changed files with 105 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/internal/catch_commandline.hpp
View File

@@ -655,7 +655,11 @@ namespace Catch {
};
inline void abortAfterFirst( ConfigData& config ) { config.abortAfter = 1; }
inline void abortAfterX( ConfigData& config, int x ) { config.abortAfter = x; }
inline void abortAfterX( ConfigData& config, int x ) {
if( x < 1 )
throw std::runtime_error( "Value after -x or --abortAfter must be greater than zero" );
config.abortAfter = x;
}
inline void addTestOrTags( ConfigData& config, std::string const& _testSpec ) { config.testsOrTags.push_back( _testSpec ); }
inline void addWarning( ConfigData& config, std::string const& _warning ) {
@@ -670,10 +674,12 @@ namespace Catch {
config.verbosity = (ConfigData::Verbosity::Level)level;
}
inline void parseCommandLine( int argc, char* const argv[], ConfigData& config ) {
inline Clara::CommandLine<ConfigData> makeCommandLineParser() {
Clara::CommandLine<ConfigData> cli;
cli.bindProcessName( &ConfigData::processName );
cli.bind( &ConfigData::showHelp )
.describe( "display usage information" )
.shortOpt( "?")
@@ -690,7 +696,7 @@ namespace Catch {
.shortOpt( "t")
.longOpt( "list-tags" );
cli.bind( &ConfigData::listTags )
cli.bind( &ConfigData::listReporters )
.describe( "list all reporters" )
.longOpt( "list-reporters" );
@@ -754,12 +760,7 @@ namespace Catch {
.describe( "which test or tests to use" )
.argName( "test name, pattern or tags" );
// cli.parseInto( argc, argv, config );
// Legacy way
CommandParser parser( argc, argv );
AllOptions options;
options.parseIntoConfig( parser, config );
return cli;
}
} // end namespace Catch