diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 06:02:56 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 06:02:56 +0000 |
| commit | 5290aaa39b51aa27d3f64fba3bc5fff6a08e3a26 (patch) | |
| tree | 3d8b2b8c80612b8c4f5666ab9bb4fb0f4440cb02 /third_party/boost | |
| parent | 6718396a176de7efdab274a06df93dcd03d84088 (diff) | |
| download | chromium_src-5290aaa39b51aa27d3f64fba3bc5fff6a08e3a26.zip chromium_src-5290aaa39b51aa27d3f64fba3bc5fff6a08e3a26.tar.gz chromium_src-5290aaa39b51aa27d3f64fba3bc5fff6a08e3a26.tar.bz2 | |
Retry to checkin a version of gmock, modified to use our boost_tuple in VS2005.
This checkin adds gmock, and a small example of how to write a gmock-based unittest.
Original Review URL: http://codereview.chromium.org/113807
Review URL: http://codereview.chromium.org/115846
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/boost')
| -rw-r--r-- | third_party/boost/boost.gyp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/third_party/boost/boost.gyp b/third_party/boost/boost.gyp index e1b5be1..5239a7f 100644 --- a/third_party/boost/boost.gyp +++ b/third_party/boost/boost.gyp @@ -413,9 +413,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ -# TODO(ajwong): Enable with the gmock checkin. -# 'boost_1_36_0/boost/tr1/tr1', -# 'boost_1_36_0', + 'boost_1_36_0', ], }, } |