diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-04-09 02:57:38 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-04-09 02:57:38 +0000 |
| commit | 7fa242a44b47ce74d7246440b14571f7a5dd1b17 (patch) | |
| tree | 968a9d50b23d7ef33cf37aaed77d23f0407fde7d /test/gtest_color_test.py | |
| parent | c12f63214e9b7761d27e68353e4aaf1761c9cf88 (diff) | |
| download | googletest-7fa242a44b47ce74d7246440b14571f7a5dd1b17.tar.gz googletest-7fa242a44b47ce74d7246440b14571f7a5dd1b17.tar.bz2 googletest-7fa242a44b47ce74d7246440b14571f7a5dd1b17.zip | |
Makes the Python tests more stable (by Vlad Losev); fixes a memory leak in GetThreadCount() on Mac (by Vlad Losev); improves fuse_gtest_files.py to support fusing Google Mock files (by Zhanyong Wan).
Diffstat (limited to 'test/gtest_color_test.py')
| -rwxr-xr-x | test/gtest_color_test.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/test/gtest_color_test.py b/test/gtest_color_test.py index 5260a899..32db4b9a 100755 --- a/test/gtest_color_test.py +++ b/test/gtest_color_test.py @@ -38,11 +38,11 @@ import os import sys import unittest +IS_WINDOWS = os.name = 'nt' COLOR_ENV_VAR = 'GTEST_COLOR' COLOR_FLAG = 'gtest_color' -COMMAND = os.path.join(gtest_test_utils.GetBuildDir(), - 'gtest_color_test_') +COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_color_test_') def SetEnvVar(env_var, value): @@ -69,11 +69,12 @@ class GTestColorTest(unittest.TestCase): def testNoEnvVarNoFlag(self): """Tests the case when there's neither GTEST_COLOR nor --gtest_color.""" - self.assert_(not UsesColor('dumb', None, None)) - self.assert_(not UsesColor('emacs', None, None)) - self.assert_(not UsesColor('xterm-mono', None, None)) - self.assert_(not UsesColor('unknown', None, None)) - self.assert_(not UsesColor(None, None, None)) + if not IS_WINDOWS: + self.assert_(not UsesColor('dumb', None, None)) + self.assert_(not UsesColor('emacs', None, None)) + self.assert_(not UsesColor('xterm-mono', None, None)) + self.assert_(not UsesColor('unknown', None, None)) + self.assert_(not UsesColor(None, None, None)) self.assert_(UsesColor('cygwin', None, None)) self.assert_(UsesColor('xterm', None, None)) self.assert_(UsesColor('xterm-color', None, None)) @@ -83,7 +84,8 @@ class GTestColorTest(unittest.TestCase): self.assert_(not UsesColor('dumb', None, 'no')) self.assert_(not UsesColor('xterm-color', None, 'no')) - self.assert_(not UsesColor('emacs', None, 'auto')) + if not IS_WINDOWS: + self.assert_(not UsesColor('emacs', None, 'auto')) self.assert_(UsesColor('xterm', None, 'auto')) self.assert_(UsesColor('dumb', None, 'yes')) self.assert_(UsesColor('xterm', None, 'yes')) @@ -93,7 +95,8 @@ class GTestColorTest(unittest.TestCase): self.assert_(not UsesColor('dumb', 'no', None)) self.assert_(not UsesColor('xterm-color', 'no', None)) - self.assert_(not UsesColor('dumb', 'auto', None)) + if not IS_WINDOWS: + self.assert_(not UsesColor('dumb', 'auto', None)) self.assert_(UsesColor('xterm-color', 'auto', None)) self.assert_(UsesColor('dumb', 'yes', None)) self.assert_(UsesColor('xterm-color', 'yes', None)) |