From 5290aaa39b51aa27d3f64fba3bc5fff6a08e3a26 Mon Sep 17 00:00:00 2001 From: "ajwong@chromium.org" Date: Thu, 28 May 2009 06:02:56 +0000 Subject: 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 --- base/base.gyp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'base/base.gyp') 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': [ -- cgit v1.1