diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-04-07 21:03:22 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-04-07 21:03:22 +0000 |
| commit | c12f63214e9b7761d27e68353e4aaf1761c9cf88 (patch) | |
| tree | 78dba5344afb37f56eb716fbe75786aab1eb52d9 /scons | |
| parent | 0da92aaf7f696ebfa2374247ae9010dacbc057fc (diff) | |
| download | googletest-c12f63214e9b7761d27e68353e4aaf1761c9cf88.tar.gz googletest-c12f63214e9b7761d27e68353e4aaf1761c9cf88.tar.bz2 googletest-c12f63214e9b7761d27e68353e4aaf1761c9cf88.zip | |
Adds sample4_unittest to scons (by Vlad Losev); adds logic for getting the thread count on Mac (by Vlad Losev); adds HasFailure() and HasNonfatalFailure() (by Zhanyong Wan).
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/SConscript | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scons/SConscript b/scons/SConscript index 91bf985b..6a7cc137 100644 --- a/scons/SConscript +++ b/scons/SConscript @@ -273,6 +273,8 @@ if env.get('GTEST_BUILD_SAMPLES', False): GtestSample(env, 'sample2_unittest', gtest_main, additional_sources=['../samples/sample2.cc']) GtestSample(env, 'sample3_unittest', gtest_main) + GtestSample(env, 'sample4_unittest', gtest_main, + additional_sources=['../samples/sample4.cc']) GtestSample(env, 'sample5_unittest', gtest_main, additional_sources=[sample1_obj]) GtestSample(env, 'sample6_unittest', gtest_main) |