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

Use Clara v0.0.1.1

Browse Source
This commit is contained in:
Phil Nash
2016-02-10 19:21:09 +00:00
parent ffad3a0a39
commit 880a2046d9
2 changed files with 188 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/catch_session.hpp
View File

@@ -131,7 +131,7 @@ namespace Catch {
Catch::cout() << "For more detail usage please see the project docs\n" << std::endl;
}
int applyCommandLine( int argc, char const* const argv[], OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) {
int applyCommandLine( int argc, char const* argv[], OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) {
try {
m_cli.setThrowOnUnrecognisedTokens( unusedOptionBehaviour == OnUnusedOptions::Fail );
m_unusedTokens = m_cli.parseInto( argc, argv, m_configData );
@@ -158,13 +158,16 @@ namespace Catch {
m_config.reset();
}
int run( int argc, char const* const argv[] ) {
int run( int argc, char const* argv[] ) {
int returnCode = applyCommandLine( argc, argv );
if( returnCode == 0 )
returnCode = run();
return returnCode;
}
int run( int argc, char* argv[] ) {
return run( argc, const_cast<char const**>( argv ) );
}
int run() {
if( m_configData.showHelp )