summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-26 21:49:53 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-26 21:49:53 +0000
commite88648a5287fe504f34b83b44b73fc081616c9b1 (patch)
treea7ac5673f71f6747b2235f4bd103d78e44432874 /third_party
parent4b9b80ddcf8dd334888f790753ab003c351e974d (diff)
downloadchromium_src-e88648a5287fe504f34b83b44b73fc081616c9b1.zip
chromium_src-e88648a5287fe504f34b83b44b73fc081616c9b1.tar.gz
chromium_src-e88648a5287fe504f34b83b44b73fc081616c9b1.tar.bz2
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. Review URL: http://codereview.chromium.org/113807 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/boost/boost.gyp4
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',
],
},
}