Implements --gtest_throw_on_failure for using gtest with other testing frameworks.

1 files changed, 13 insertions, 8 deletions

diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h
index 7fecb92f..9b72b636 100644
--- a/include/gtest/gtest.h
+++ b/include/gtest/gtest.h
@@ -101,20 +101,20 @@ GTEST_DECLARE_bool_(also_run_disabled_tests);
 // This flag brings the debugger on an assertion failure.
 GTEST_DECLARE_bool_(break_on_failure);
 
-// This flag controls whether Google Test catches all test-thrown exceptions 
-// and logs them as failures. 
+// This flag controls whether Google Test catches all test-thrown exceptions
+// and logs them as failures.
 GTEST_DECLARE_bool_(catch_exceptions);
 
-// This flag enables using colors in terminal output. Available values are 
-// "yes" to enable colors, "no" (disable colors), or "auto" (the default) 
+// This flag enables using colors in terminal output. Available values are
+// "yes" to enable colors, "no" (disable colors), or "auto" (the default)
 // to let Google Test decide.
 GTEST_DECLARE_string_(color);
 
-// This flag sets up the filter to select by name using a glob pattern 
+// This flag sets up the filter to select by name using a glob pattern
 // the tests to run. If the filter is not given all tests are executed.
 GTEST_DECLARE_string_(filter);
 
-// This flag causes the Google Test to list tests. None of the tests listed 
+// This flag causes the Google Test to list tests. None of the tests listed
 // are actually run if the flag is provided.
 GTEST_DECLARE_bool_(list_tests);
 
@@ -122,11 +122,11 @@ GTEST_DECLARE_bool_(list_tests);
 // in addition to its normal textual output.
 GTEST_DECLARE_string_(output);
 
-// This flags control whether Google Test prints the elapsed time for each 
+// This flags control whether Google Test prints the elapsed time for each
 // test.
 GTEST_DECLARE_bool_(print_time);
 
-// This flag sets how many times the tests are repeated. The default value 
+// This flag sets how many times the tests are repeated. The default value
 // is 1. If the value is -1 the tests are repeating forever.
 GTEST_DECLARE_int32_(repeat);
 
@@ -138,6 +138,11 @@ GTEST_DECLARE_bool_(show_internal_stack_frames);
 // printed in a failure message.
 GTEST_DECLARE_int32_(stack_trace_depth);
 
+// When this flag is specified, a failed assertion will throw an
+// exception if exceptions are enabled, or exit the program with a
+// non-zero code otherwise.
+GTEST_DECLARE_bool_(throw_on_failure);
+
 // The upper limit for valid stack trace depths.
 const int kMaxStackTraceDepth = 100;