diff options
author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-12-01 19:42:25 +0000 |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-12-01 19:42:25 +0000 |
commit | f6d6a22b8eea931b49a8c33de3092d4623ed0d41 (patch) | |
tree | a0608d2270992b90160a57c68014fb65ade117df /scons/SConscript | |
parent | 19eb9e9e3d4d5a4f0eee786d7664ca0e45137390 (diff) | |
download | googletest-f6d6a22b8eea931b49a8c33de3092d4623ed0d41.tar.gz googletest-f6d6a22b8eea931b49a8c33de3092d4623ed0d41.tar.bz2 googletest-f6d6a22b8eea931b49a8c33de3092d4623ed0d41.zip |
Fixes Cygwin compatibility (by Vlad Losev); Improves Python tests (by Vlad Losev); Fixes ambiguous call to implicit_cast; Uses gtest's SkipPrefix() instead gmock's own (by Vlad Losev).
Diffstat (limited to 'scons/SConscript')
-rw-r--r-- | scons/SConscript | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/scons/SConscript b/scons/SConscript index 80891209..73c5b916 100644 --- a/scons/SConscript +++ b/scons/SConscript @@ -194,9 +194,6 @@ GtestTest(env, 'gmock_test', [gtest, gmock_main]) # gmock_all_test is commented to save time building and running tests. # Uncomment if necessary. #GtestTest(env, 'gmock_all_test', [gtest, gmock_main]) -# TODO (vladl): Add a test verifying that gmock can be built from -# testing/base/gunit.cc and testing/base/internal/gmock-all.cc after merging -# into the main branch. This is the API for Windows users. ############################################################ # Tests targets using custom environments. |