aboutsummaryrefslogtreecommitdiffstats
path: root/test/gtest_output_test.py
diff options
context:
space:
mode:
authorkosak <kosak@google.com>2014-03-24 21:58:25 +0000
committerkosak <kosak@google.com>2014-03-24 21:58:25 +0000
commita6340420b9cee27f77c5b91bea807121914a5831 (patch)
treea761f77d59d13f7dea8e415b4e0d64ad765c6f72 /test/gtest_output_test.py
parentffea2d604031a8c732cec8f8de9d9f9bcfbbcf70 (diff)
downloadgoogletest-a6340420b9cee27f77c5b91bea807121914a5831.tar.gz
googletest-a6340420b9cee27f77c5b91bea807121914a5831.tar.bz2
googletest-a6340420b9cee27f77c5b91bea807121914a5831.zip
Implement threading support for gtest on Windows.
Also, stop using localtime(). Instead, use localtime_r() on most systems, localtime_s() on Windows.
Diffstat (limited to 'test/gtest_output_test.py')
-rwxr-xr-xtest/gtest_output_test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gtest_output_test.py b/test/gtest_output_test.py
index f409e2a7..fa1a3117 100755
--- a/test/gtest_output_test.py
+++ b/test/gtest_output_test.py
@@ -252,8 +252,8 @@ SUPPORTS_STACK_TRACES = False
CAN_GENERATE_GOLDEN_FILE = (SUPPORTS_DEATH_TESTS and
SUPPORTS_TYPED_TESTS and
- SUPPORTS_THREADS)
-
+ SUPPORTS_THREADS and
+ not IS_WINDOWS)
class GTestOutputTest(gtest_test_utils.TestCase):
def RemoveUnsupportedTests(self, test_output):