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 /base/base.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 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/base/base.gyp b/base/base.gyp index aa168c1..a294726 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -590,16 +590,12 @@ 'type': 'executable', 'msvs_guid': '27A30967-4BBA-48D1-8522-CDE95F7B1CEC', 'sources': [ - 'crypto/signature_verifier_unittest.cc', - 'gfx/jpeg_codec_unittest.cc', - 'gfx/native_theme_unittest.cc', - 'gfx/png_codec_unittest.cc', - 'gfx/rect_unittest.cc', 'at_exit_unittest.cc', 'atomicops_unittest.cc', 'clipboard_unittest.cc', 'command_line_unittest.cc', 'condition_variable_unittest.cc', + 'crypto/signature_verifier_unittest.cc', 'data_pack_unittest.cc', 'debug_util_unittest.cc', 'directory_watcher_unittest.cc', @@ -608,6 +604,11 @@ 'file_path_unittest.cc', 'file_util_unittest.cc', 'file_version_info_unittest.cc', + 'gfx/jpeg_codec_unittest.cc', + 'gfx/native_theme_unittest.cc', + 'gfx/png_codec_unittest.cc', + 'gfx/rect_unittest.cc', + 'gmock_unittest.cc', 'histogram_unittest.cc', 'hmac_unittest.cc', 'idletimer_unittest.cc', @@ -673,6 +674,7 @@ 'base', 'base_gfx', '../skia/skia.gyp:skia', + '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', ], 'conditions': [ |