diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-07-01 04:58:05 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-07-01 04:58:05 +0000 |
| commit | b2db677c9905a34ca6454aa526f7a0cc5cfaeca1 (patch) | |
| tree | 673f967d6404ea730ccb3d93f30cd3bff5fc8a0e /test/gtest_color_test.py | |
| parent | 1b61f16aef4ea5bb2a7b28e759996dab10e0ca72 (diff) | |
| download | googletest-b2db677c9905a34ca6454aa526f7a0cc5cfaeca1.tar.gz googletest-b2db677c9905a34ca6454aa526f7a0cc5cfaeca1.tar.bz2 googletest-b2db677c9905a34ca6454aa526f7a0cc5cfaeca1.zip | |
Reduces the flakiness of gtest-port_test on Mac; improves the Python tests; hides methods that we don't want to publish; makes win-dbg8 the default scons configuration (all by Vlad Losev).
Diffstat (limited to 'test/gtest_color_test.py')
| -rwxr-xr-x | test/gtest_color_test.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/gtest_color_test.py b/test/gtest_color_test.py index f617dc5c..cccf2d89 100755 --- a/test/gtest_color_test.py +++ b/test/gtest_color_test.py @@ -58,10 +58,13 @@ def UsesColor(term, color_env_var, color_flag): SetEnvVar('TERM', term) SetEnvVar(COLOR_ENV_VAR, color_env_var) - cmd = COMMAND - if color_flag is not None: - cmd += ' --%s=%s' % (COLOR_FLAG, color_flag) - return gtest_test_utils.GetExitStatus(os.system(cmd)) + + if color_flag is None: + args = [] + else: + args = ['--%s=%s' % (COLOR_FLAG, color_flag)] + p = gtest_test_utils.Subprocess([COMMAND] + args) + return not p.exited or p.exit_code class GTestColorTest(gtest_test_utils.TestCase): |