From 8d02b9306dd0abbdc44803d03537f266d83bb548 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Sat, 2 Jun 2012 23:26:32 +0100
Subject: [PATCH] Changed --cutoff to --abort

---
 include/catch_runner.hpp               |  2 +-
 include/internal/catch_commandline.hpp |  2 +-
 projects/SelfTest/TestMain.cpp         | 18 +++++++++---------
 single_include/catch.hpp               |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/catch_runner.hpp b/include/catch_runner.hpp
index 73204f1f..450e071e 100644
--- a/include/catch_runner.hpp
+++ b/include/catch_runner.hpp
@@ -84,7 +84,7 @@ namespace Catch {
             << "\t-s, --success\n"
             << "\t-b, --break\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;    
     }
     inline void showHelp( std::string exeName ) {
diff --git a/include/internal/catch_commandline.hpp b/include/internal/catch_commandline.hpp
index 52be1171..e7195d2f 100644
--- a/include/internal/catch_commandline.hpp
+++ b/include/internal/catch_commandline.hpp
@@ -162,7 +162,7 @@ namespace Catch {
                 config.setShowHelp( true );
             }
 
-            if( Command cmd = parser.find( "-c", "--cutoff" ) ) {
+            if( Command cmd = parser.find( "-a", "--abort" ) ) {
                 if( cmd.argsCount() > 1 )
                     throw std::domain_error( cmd.name() + " only accepts 0-1 arguments" );
                 int threshold = 1;
diff --git a/projects/SelfTest/TestMain.cpp b/projects/SelfTest/TestMain.cpp
index 1de9386e..1b4b507c 100644
--- a/projects/SelfTest/TestMain.cpp
+++ b/projects/SelfTest/TestMain.cpp
@@ -202,23 +202,23 @@ TEST_CASE( "selftest/parser", "" ) {
         }
     }
     
-    SECTION( "cutoff", "" ) {
-        SECTION( "-c", "" ) {
-            const char* argv[] = { "test", "-c" };
+    SECTION( "abort", "" ) {
+        SECTION( "-a", "" ) {
+            const char* argv[] = { "test", "-a" };
             Catch::Config config;
             CHECK( parseIntoConfig( argv, config ) );
 
             REQUIRE( config.getCutoff() == 1 );
         }
-        SECTION( "-c/2", "" ) {
-            const char* argv[] = { "test", "-c", "2" };
+        SECTION( "-a/2", "" ) {
+            const char* argv[] = { "test", "-a", "2" };
             Catch::Config config;
             CHECK( parseIntoConfig( argv, config ) );
 
             REQUIRE( config.getCutoff() == 2 );
         }
-        SECTION( "-c/error", "cutoff only takes one argument" ) {
-            const char* argv[] = { "test", "-c", "1", "2" };
+        SECTION( "-a/error", "cutoff only takes one argument" ) {
+            const char* argv[] = { "test", "-a", "1", "2" };
             Catch::Config config;
             CHECK( parseIntoConfig( argv, config ) == false );
 
@@ -226,8 +226,8 @@ TEST_CASE( "selftest/parser", "" ) {
         }
     }
     SECTION( "combinations", "" ) {
-        SECTION( "-c -b", "" ) {
-            const char* argv[] = { "test", "-c", "-b" };
+        SECTION( "-a -b", "" ) {
+            const char* argv[] = { "test", "-a", "-b" };
             Catch::Config config;
             CHECK( parseIntoConfig( argv, config ) );
 
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index 8572cff5..ee470a73 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -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
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -3600,7 +3600,7 @@ namespace Catch {
                 config.setShowHelp( true );
             }
 
-            if( Command cmd = parser.find( "-c", "--cutoff" ) ) {
+            if( Command cmd = parser.find( "-a", "--abort" ) ) {
                 if( cmd.argsCount() > 1 )
                     throw std::domain_error( cmd.name() + " only accepts 0-1 arguments" );
                 int threshold = 1;
@@ -4624,7 +4624,7 @@ namespace Catch {
             << "\t-s, --success\n"
             << "\t-b, --break\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;
     }
     inline void showHelp( std::string exeName ) {