diff options
author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-02-24 17:19:25 +0000 |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-02-24 17:19:25 +0000 |
commit | 3bef459eac9aa84c579f34249aebc9ff56832054 (patch) | |
tree | c91cb1205fb45e4a96889ae478afa66a0559694c /test/gtest_output_test.py | |
parent | dd280cfa8dff2247f71a1177d7c8f0c2fde9789a (diff) | |
download | googletest-3bef459eac9aa84c579f34249aebc9ff56832054.tar.gz googletest-3bef459eac9aa84c579f34249aebc9ff56832054.tar.bz2 googletest-3bef459eac9aa84c579f34249aebc9ff56832054.zip |
Adds threading support (by Miklos Fazekas, Vlad Losev, and Chandler Carruth); adds wide InitGoogleTest to gtest.def (by Vlad Losev); updates the version number (by Zhanyong Wan); updates the release notes for 1.5.0 (by Vlad Losev); removes scons scripts from the distribution (by Zhanyong Wan); adds the cmake build script to the distribution (by Zhanyong Wan); adds fused source files to the distribution (by Vlad Losev and Chandler Carruth).
Diffstat (limited to 'test/gtest_output_test.py')
-rwxr-xr-x | test/gtest_output_test.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/gtest_output_test.py b/test/gtest_output_test.py index a0aa64fd..4374a96e 100755 --- a/test/gtest_output_test.py +++ b/test/gtest_output_test.py @@ -238,7 +238,9 @@ SUPPORTS_TYPED_TESTS = 'TypedTest' in test_list SUPPORTS_THREADS = 'ExpectFailureWithThreadsTest' in test_list SUPPORTS_STACK_TRACES = False -CAN_GENERATE_GOLDEN_FILE = SUPPORTS_DEATH_TESTS and SUPPORTS_TYPED_TESTS +CAN_GENERATE_GOLDEN_FILE = (SUPPORTS_DEATH_TESTS and + SUPPORTS_TYPED_TESTS and + SUPPORTS_THREADS) class GTestOutputTest(gtest_test_utils.TestCase): @@ -314,8 +316,8 @@ that does not support all the required features (death tests""") """\nand typed tests). Please check that you are using VC++ 8.0 SP1 or higher as your compiler.""") else: - message += """\nand typed tests). Please generate the golden file -using a binary built with those features enabled.""" + message += """\ntyped tests, and threads). Please generate the +golden file using a binary built with those features enabled.""" sys.stderr.write(message) sys.exit(1) |