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

Changed --cutoff to --abort

Browse Source
This commit is contained in:
Phil Nash 2012-06-02 23:26:32 +01:00
parent 0f9c551d4d
commit 8d02b9306d
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/catch_runner.hpp
View File

@ -84,7 +84,7 @@ namespace Catch {
<< "\t-s, --success\n" << "\t-s, --success\n"
<< "\t-b, --break\n" << "\t-b, --break\n"
<< "\t-n, --name <name>\n" << "\t-n, --name <name>\n"
<< "\t-c, --cutoff [#]\n\n" << "\t-a, --abort [#]\n\n"
<< "For more detail usage please see: https://github.com/philsquared/Catch/wiki/Command-line" << std::endl; << "For more detail usage please see: https://github.com/philsquared/Catch/wiki/Command-line" << std::endl;
} }
inline void showHelp( std::string exeName ) { inline void showHelp( std::string exeName ) {

2
include/internal/catch_commandline.hpp
View File

@ -162,7 +162,7 @@ namespace Catch {
config.setShowHelp( true ); config.setShowHelp( true );
} }
if( Command cmd = parser.find( "-c", "--cutoff" ) ) { if( Command cmd = parser.find( "-a", "--abort" ) ) {
if( cmd.argsCount() > 1 ) if( cmd.argsCount() > 1 )
throw std::domain_error( cmd.name() + " only accepts 0-1 arguments" ); throw std::domain_error( cmd.name() + " only accepts 0-1 arguments" );
int threshold = 1; int threshold = 1;

18
projects/SelfTest/TestMain.cpp
View File

@ -202,23 +202,23 @@ TEST_CASE( "selftest/parser", "" ) {
} }
} }
SECTION( "cutoff", "" ) { SECTION( "abort", "" ) {
SECTION( "-c", "" ) { SECTION( "-a", "" ) {
const char* argv[] = { "test", "-c" }; const char* argv[] = { "test", "-a" };
Catch::Config config; Catch::Config config;
CHECK( parseIntoConfig( argv, config ) ); CHECK( parseIntoConfig( argv, config ) );
REQUIRE( config.getCutoff() == 1 ); REQUIRE( config.getCutoff() == 1 );
} }
SECTION( "-c/2", "" ) { SECTION( "-a/2", "" ) {
const char* argv[] = { "test", "-c", "2" }; const char* argv[] = { "test", "-a", "2" };
Catch::Config config; Catch::Config config;
CHECK( parseIntoConfig( argv, config ) ); CHECK( parseIntoConfig( argv, config ) );
REQUIRE( config.getCutoff() == 2 ); REQUIRE( config.getCutoff() == 2 );
} }
SECTION( "-c/error", "cutoff only takes one argument" ) { SECTION( "-a/error", "cutoff only takes one argument" ) {
const char* argv[] = { "test", "-c", "1", "2" }; const char* argv[] = { "test", "-a", "1", "2" };
Catch::Config config; Catch::Config config;
CHECK( parseIntoConfig( argv, config ) == false ); CHECK( parseIntoConfig( argv, config ) == false );
@ -226,8 +226,8 @@ TEST_CASE( "selftest/parser", "" ) {
} }
} }
SECTION( "combinations", "" ) { SECTION( "combinations", "" ) {
SECTION( "-c -b", "" ) { SECTION( "-a -b", "" ) {
const char* argv[] = { "test", "-c", "-b" }; const char* argv[] = { "test", "-a", "-b" };
Catch::Config config; Catch::Config config;
CHECK( parseIntoConfig( argv, config ) ); CHECK( parseIntoConfig( argv, config ) );

6
single_include/catch.hpp
View File

@ -1,5 +1,5 @@
/* /*
* Generated: 2012-06-02 23:11:28.498355 * Generated: 2012-06-02 23:25:57.372770
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -3600,7 +3600,7 @@ namespace Catch {
config.setShowHelp( true ); config.setShowHelp( true );
} }
if( Command cmd = parser.find( "-c", "--cutoff" ) ) { if( Command cmd = parser.find( "-a", "--abort" ) ) {
if( cmd.argsCount() > 1 ) if( cmd.argsCount() > 1 )
throw std::domain_error( cmd.name() + " only accepts 0-1 arguments" ); throw std::domain_error( cmd.name() + " only accepts 0-1 arguments" );
int threshold = 1; int threshold = 1;
@ -4624,7 +4624,7 @@ namespace Catch {
<< "\t-s, --success\n" << "\t-s, --success\n"
<< "\t-b, --break\n" << "\t-b, --break\n"
<< "\t-n, --name <name>\n" << "\t-n, --name <name>\n"
<< "\t-c, --cutoff [#]\n\n" << "\t-a, --abort [#]\n\n"
<< "For more detail usage please see: https://github.com/philsquared/Catch/wiki/Command-line" << std::endl; << "For more detail usage please see: https://github.com/philsquared/Catch/wiki/Command-line" << std::endl;
} }
inline void showHelp( std::string exeName ) { inline void showHelp( std::string exeName ) {