aboutsummaryrefslogtreecommitdiffstats
path: root/scons/SConscript
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-09-04 18:30:25 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-09-04 18:30:25 +0000
commit16e9dd6e28a8a7fb2d611011e7353e042fcb282f (patch)
treef990763455e874fb887364bbd9c712386824d20d /scons/SConscript
parent56a2e686e915d483cb22db091140130b23814127 (diff)
downloadgoogletest-16e9dd6e28a8a7fb2d611011e7353e042fcb282f.tar.gz
googletest-16e9dd6e28a8a7fb2d611011e7353e042fcb282f.tar.bz2
googletest-16e9dd6e28a8a7fb2d611011e7353e042fcb282f.zip
More implementation of the event listener interface (by Vlad Losev); Reduces the stack space usage of assertions by moving AssertHelper's fields to the heap (by Jorg Brown); Makes String faster, smaller, and simpler (by Zhanyong Wan); Fixes a bug in String::Format() (by Chandler); Adds the /MD version of VC projects to the distribution (by Vlad Losev).
Diffstat (limited to 'scons/SConscript')
-rw-r--r--scons/SConscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/scons/SConscript b/scons/SConscript
index 8fbd5f56..e8818286 100644
--- a/scons/SConscript
+++ b/scons/SConscript
@@ -318,8 +318,9 @@ GtestTest(env, 'gtest_list_tests_unittest_', gtest)
GtestTest(env, 'gtest_throw_on_failure_test_', gtest)
GtestTest(env, 'gtest_xml_outfile1_test_', gtest_main)
GtestTest(env, 'gtest_xml_outfile2_test_', gtest_main)
-GtestTest(env, 'gtest_xml_output_unittest_', gtest_main)
+GtestTest(env, 'gtest_xml_output_unittest_', gtest)
GtestTest(env, 'gtest-unittest-api_test', gtest)
+GtestTest(env, 'gtest-listener_test', gtest)
############################################################
# Tests targets using custom environments.