diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-17 15:48:56 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-17 15:48:56 (GMT) |
commit | a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d (patch) | |
tree | 32d0dac55ff598f9732ff57581044eabd24fa807 /googletest/test/gtest_xml_output_unittest.py | |
parent | 421e7b4f29fc761c66d2773a1fc318a738a6d3da (diff) | |
parent | 02a8ca87735601466d8c564344f9be493da84708 (diff) | |
download | googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.zip googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.tar.gz googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.tar.bz2 |
Merge branch 'master' into fix-msvc-d9025-warningrefs/pull/1612/head
Diffstat (limited to 'googletest/test/gtest_xml_output_unittest.py')
-rwxr-xr-x | googletest/test/gtest_xml_output_unittest.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/googletest/test/gtest_xml_output_unittest.py b/googletest/test/gtest_xml_output_unittest.py index 6ffb6e3..faedd4e 100755 --- a/googletest/test/gtest_xml_output_unittest.py +++ b/googletest/test/gtest_xml_output_unittest.py @@ -47,17 +47,22 @@ GTEST_OUTPUT_FLAG = '--gtest_output' GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.xml' GTEST_PROGRAM_NAME = 'gtest_xml_output_unittest_' +# The flag indicating stacktraces are not supported +NO_STACKTRACE_SUPPORT_FLAG = '--no_stacktrace_support' + # The environment variables for test sharding. TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS' SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX' SHARD_STATUS_FILE_ENV_VAR = 'GTEST_SHARD_STATUS_FILE' -SUPPORTS_STACK_TRACES = False +SUPPORTS_STACK_TRACES = NO_STACKTRACE_SUPPORT_FLAG not in sys.argv if SUPPORTS_STACK_TRACES: STACK_TRACE_TEMPLATE = '\nStack trace:\n*' else: STACK_TRACE_TEMPLATE = '' + # unittest.main() can't handle unknown flags + sys.argv.remove(NO_STACKTRACE_SUPPORT_FLAG) EXPECTED_NON_EMPTY_XML = """<?xml version="1.0" encoding="UTF-8"?> <testsuites tests="23" failures="4" disabled="2" errors="0" time="*" timestamp="*" name="AllTests" ad_hoc_property="42"> |