eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blocks test binaries from inheriting GTEST_OUTPUT variable when invoked from Python test scripts (fixes issue 223).

Browse Source
This commit is contained in:
vladlosev 2009-11-17 22:41:27 +00:00
parent b99c9eceab
commit 24ccb2c3e0
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/gtest_test_utils.py
View File

@ -51,6 +51,7 @@ except:
_SUBPROCESS_MODULE_AVAILABLE = False _SUBPROCESS_MODULE_AVAILABLE = False
# pylint: enable-msg=C6204 # pylint: enable-msg=C6204
GTEST_OUTPUT_VAR_NAME = 'GTEST_OUTPUT'
IS_WINDOWS = os.name == 'nt' IS_WINDOWS = os.name == 'nt'
IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0] IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0]
@ -267,4 +268,11 @@ def Main():
# unittest.main(). Otherwise the latter will be confused by the # unittest.main(). Otherwise the latter will be confused by the
# --gtest_* flags. # --gtest_* flags.
_ParseAndStripGTestFlags(sys.argv) _ParseAndStripGTestFlags(sys.argv)
# The tested binaries should not be writing XML output files unless the
# script explicitly instructs them to.
# TODO(vladl@google.com): Move this into Subprocess when we implement
# passing environment into it as a parameter.
if GTEST_OUTPUT_VAR_NAME in os.environ:
del os.environ[GTEST_OUTPUT_VAR_NAME]
_test_module.main() _test_module.main()