summaryrefslogtreecommitdiffstats
path: root/scons
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2009-10-20 21:03:10 (GMT)
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2009-10-20 21:03:10 (GMT)
commitbad778caa39a88b7c11b159e20730aeec4fd711e (patch)
treeab4f68a695479be0a9eaadcadc364f6c4b06d0c0 /scons
parent060804deb8c05b5ea5735b875eaea2c7493e2262 (diff)
downloadgoogletest-bad778caa39a88b7c11b159e20730aeec4fd711e.zip
googletest-bad778caa39a88b7c11b159e20730aeec4fd711e.tar.gz
googletest-bad778caa39a88b7c11b159e20730aeec4fd711e.tar.bz2
Implements support for AssertionResult in Boolean assertions such as EXPECT_TRUE; Fixes Google Tests's tuple implementation to default-initialize its fields in the default constructor (by Zhanyong Wan); Populates gtest_stress_test.cc with actual tests.
Diffstat (limited to 'scons')
-rw-r--r--scons/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/scons/SConscript b/scons/SConscript
index 60745f2..e1ccb7e 100644
--- a/scons/SConscript
+++ b/scons/SConscript
@@ -279,6 +279,7 @@ if BUILD_TESTS:
GtestTest(env_with_exceptions, 'gtest_output_test_', gtest_ex)
GtestTest(env_with_exceptions, 'gtest_throw_on_failure_ex_test', gtest_ex)
GtestTest(env_with_threads, 'gtest-death-test_test', gtest_main)
+ GtestTest(env_with_threads, 'gtest_stress_test', gtest)
GtestTest(env_less_optimized, 'gtest_env_var_test_', gtest)
GtestTest(env_less_optimized, 'gtest_uninitialized_test_', gtest)
GtestTest(env_use_own_tuple, 'gtest-tuple_test', gtest_use_own_tuple_main)