gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes default of --gtest_catch_exceptions to true.

Browse Source
This commit is contained in:
vladlosev 2010-10-26 23:12:47 +00:00
parent 25958f3e4c
commit 82cc1d1135
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtest.cc
View File

@ -191,7 +191,7 @@ GTEST_DEFINE_bool_(
GTEST_DEFINE_bool_( GTEST_DEFINE_bool_(
catch_exceptions, catch_exceptions,
internal::BoolFromGTestEnv("catch_exceptions", false), internal::BoolFromGTestEnv("catch_exceptions", true),
"True iff " GTEST_NAME_ "True iff " GTEST_NAME_
" should catch exceptions and treat them as test failures."); " should catch exceptions and treat them as test failures.");
@ -4711,8 +4711,9 @@ static const char kColorEncodedHelpMessage[] =
" Turn assertion failures into debugger break-points.\n" " Turn assertion failures into debugger break-points.\n"
" @G--" GTEST_FLAG_PREFIX_ "throw_on_failure@D\n" " @G--" GTEST_FLAG_PREFIX_ "throw_on_failure@D\n"
" Turn assertion failures into C++ exceptions.\n" " Turn assertion failures into C++ exceptions.\n"
" @G--" GTEST_FLAG_PREFIX_ "catch_exceptions@D\n" " @G--" GTEST_FLAG_PREFIX_ "catch_exceptions=0@D\n"
" Suppress pop-ups caused by exceptions.\n" " Do not report exceptions as test failures. Instead, allow them\n"
" to crash the program or throw a pop-up (on Windows).\n"
"\n" "\n"
"Except for @G--" GTEST_FLAG_PREFIX_ "list_tests@D, you can alternatively set " "Except for @G--" GTEST_FLAG_PREFIX_ "list_tests@D, you can alternatively set "
"the corresponding\n" "the corresponding\n"

17
test/gtest_catch_exceptions_test.py
View File

@ -42,9 +42,10 @@ import os
import gtest_test_utils import gtest_test_utils
# Constants. # Constants.
LIST_TESTS_FLAG = '--gtest_list_tests' FLAG_PREFIX = '--gtest_'
CATCH_EXCEPTIONS_FLAG = '--gtest_catch_exceptions=1' LIST_TESTS_FLAG = FLAG_PREFIX + 'list_tests'
FILTER_FLAG='--gtest_filter' NO_CATCH_EXCEPTIONS_FLAG = FLAG_PREFIX + 'catch_exceptions=0'
FILTER_FLAG = FLAG_PREFIX + 'filter'
# Path to the gtest_catch_exceptions_ex_test_ binary, compiled with # Path to the gtest_catch_exceptions_ex_test_ binary, compiled with
# exceptions enabled. # exceptions enabled.
@ -61,11 +62,9 @@ TEST_LIST = gtest_test_utils.Subprocess([EXE_PATH, LIST_TESTS_FLAG]).output
SUPPORTS_SEH_EXCEPTIONS = 'ThrowsSehException' in TEST_LIST SUPPORTS_SEH_EXCEPTIONS = 'ThrowsSehException' in TEST_LIST
if SUPPORTS_SEH_EXCEPTIONS: if SUPPORTS_SEH_EXCEPTIONS:
BINARY_OUTPUT = gtest_test_utils.Subprocess([EXE_PATH, BINARY_OUTPUT = gtest_test_utils.Subprocess([EXE_PATH]).output
CATCH_EXCEPTIONS_FLAG]).output
EX_BINARY_OUTPUT = gtest_test_utils.Subprocess([EX_EXE_PATH, EX_BINARY_OUTPUT = gtest_test_utils.Subprocess([EX_EXE_PATH]).output
CATCH_EXCEPTIONS_FLAG]).output
# The tests. # The tests.
if SUPPORTS_SEH_EXCEPTIONS: if SUPPORTS_SEH_EXCEPTIONS:
@ -208,7 +207,9 @@ class CatchCxxExceptionsTest(gtest_test_utils.TestCase):
FITLER_OUT_SEH_TESTS_FLAG = FILTER_FLAG + '=-*Seh*' FITLER_OUT_SEH_TESTS_FLAG = FILTER_FLAG + '=-*Seh*'
# By default, Google Test doesn't catch the exceptions. # By default, Google Test doesn't catch the exceptions.
uncaught_exceptions_ex_binary_output = gtest_test_utils.Subprocess( uncaught_exceptions_ex_binary_output = gtest_test_utils.Subprocess(
[EX_EXE_PATH, FITLER_OUT_SEH_TESTS_FLAG]).output [EX_EXE_PATH,
NO_CATCH_EXCEPTIONS_FLAG,
FITLER_OUT_SEH_TESTS_FLAG]).output
self.assert_('Unhandled C++ exception terminating the program' self.assert_('Unhandled C++ exception terminating the program'
in uncaught_exceptions_ex_binary_output) in uncaught_exceptions_ex_binary_output)

4
test/gtest_env_var_test.py
View File

@ -92,9 +92,7 @@ class GTestEnvVarTest(gtest_test_utils.TestCase):
TestFlag('repeat', '999', '1') TestFlag('repeat', '999', '1')
TestFlag('throw_on_failure', '1', '0') TestFlag('throw_on_failure', '1', '0')
TestFlag('death_test_style', 'threadsafe', 'fast') TestFlag('death_test_style', 'threadsafe', 'fast')
TestFlag('catch_exceptions', '0', '1')
if IS_WINDOWS:
TestFlag('catch_exceptions', '1', '0')
if IS_LINUX: if IS_LINUX:
TestFlag('death_test_use_fork', '1', '0') TestFlag('death_test_use_fork', '1', '0')

2
test/gtest_help_test.py
View File

@ -74,7 +74,7 @@ HELP_REGEX = re.compile(
FLAG_PREFIX + r'output=.*' + FLAG_PREFIX + r'output=.*' +
FLAG_PREFIX + r'break_on_failure.*' + FLAG_PREFIX + r'break_on_failure.*' +
FLAG_PREFIX + r'throw_on_failure.*' + FLAG_PREFIX + r'throw_on_failure.*' +
FLAG_PREFIX + r'catch_exceptions.*', FLAG_PREFIX + r'catch_exceptions=0.*',
re.DOTALL) re.DOTALL)