diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-26 21:49:53 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-26 21:49:53 +0000 |
| commit | e88648a5287fe504f34b83b44b73fc081616c9b1 (patch) | |
| tree | a7ac5673f71f6747b2235f4bd103d78e44432874 /testing/gtest.gyp | |
| parent | 4b9b80ddcf8dd334888f790753ab003c351e974d (diff) | |
| download | chromium_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 'testing/gtest.gyp')
| -rw-r--r-- | testing/gtest.gyp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp index c7d5c62..061667e 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -3,9 +3,6 @@ # found in the LICENSE file. { - 'variables': { - 'chromium_code': 1, - }, 'includes': [ '../build/common.gypi', ], @@ -56,8 +53,7 @@ 'UNIT_TEST', ], 'include_dirs': [ - 'gtest', - 'gtest/include', + 'gtest/include', # So that gtest headers can find themselves. ], 'target_conditions': [ ['_type=="executable"', {'test': 1}], |