summaryrefslogtreecommitdiffstats
path: root/testing/gmock.gyp
Commit message (Collapse)AuthorAgeFilesLines
* Remove the comments setting emands and vim tab width and expansion variables.tony@chromium.org2011-07-111-6/+0
| | | | | | | | | | | | | | | | | These were added in r28089 (http://codereview.chromium.org/256059) but are unnecessary bloat for everyone to carry around, even those that don't use emacs or vim. In an earlier change, I added editor config files in src/tools/emacs/ and src/tools/vim/ so users of the appropriate editor can source those instead. BUG=none TEST=none Review URL: http://codereview.chromium.org/7310019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92046 0039d316-1c4b-4281-b951-d872f2087c98
* Remove msvs_guids from ipc, media, net, ppapi, printing, sandbox,tony@chromium.org2011-06-161-1/+0
| | | | | | | | | | sdch, skia, and testing. BUG=28727 Review URL: http://codereview.chromium.org/7165009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89369 0039d316-1c4b-4281-b951-d872f2087c98
* Globally replace <(library) with static_libraryevan@chromium.org2011-05-191-2/+2
| | | | | | | | | | | We provided <(library) as a variable to support a peculiar build configuration on Linux. We no longer support that build configuration, so we can simplify this code to no longer use a variable. Review URL: http://codereview.chromium.org/7051014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86004 0039d316-1c4b-4281-b951-d872f2087c98
* scons: excise more scons references from the code baseevan@chromium.org2010-12-031-3/+1
| | | | | | | | | | I got to undo some hacks, too! TEST=compiles Review URL: http://codereview.chromium.org/5535003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68119 0039d316-1c4b-4281-b951-d872f2087c98
* clang: update gtest to r435 and gmock to r300.evan@chromium.org2010-09-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This picks up some clang-specific fixes. Unfortunately, the gtest update cascaded into a gmock update. So I picked the earliest gmock version that mentioned a specific gtest version so that they are more likely to work together. gtest changelog: - Fixes a leak in ThreadLocal. - CMake 2.8/Visual Age compatibility patch by Hady Zalek. - C++ Builder compatibility patch by Josh Kelley. - Fixes gtest_filter_unittest and gtest_help_test on systems without death tests. - Simplifies Makefile.am (by Zhanyong Wan and Vlad Losev). - Adds alternative spellings for FAIL, SUCCEED, and TEST. - Over-hauls README, and fixes Makefile. - Fixes gtest-port_test on MinGW. - Implements color output in GNU Screen sessions (issue 277). - Minor improvement to hermetic build support in the CMake script, by Vlad Losev. - Improves support for building Google Test as Windows DLL. - Silence a Clang warning about an unused variable. - Moves the universal printer from gmock to gtest and refactors the cmake script for reusing in gmock (by Vlad Losev). - Suppresses some Clang warnings (by Chandler Carruth, Jeffrey Yasskin, and Zhanyong Wan). - Renames CMake build script options. - Lucid autotools compatibility patch by Jeffrey Yasskin. - Replaces UniversalPrinter<T>::Print(x, os) with UniversalPrint(x, os) as appropriate (by Zhanyong Wan). - Comment tweaks in CMakeLists.txt. - Renames test script flags. - Fixes a typo in comments. - Adds GTEST_REMOVE_REFERENCE_AND_CONST_. - Introduces gtest_force_shared_crt option for CMake build scripts. - Implements printing parameters of failed parameterized tests (issue 71). gmock changelog: - Improves Makefile.am (by Vlad Losev); fixes Makefile and updates README (by Zhanyong Wan). - Fixes a typo in README. - Adds Each(m) (by Wojtek Moczydlowski); removes scripts/test/Makefile (by Zhanyong Wan); pulls in gtest r424. - Adds a synchronization test. - Fixes tests leaking altered values of GMOCK_FLAG(verbose) (issue 110). - Moves the universal printer from gmock to gtest (by Vlad Losev). - Renames test script flags. - Adds CMake build script. - Implements Pointwise(). - Fixes build failure on Windows/CMake (issue 111). - Pulls r435 of gtest. This brings in the gtest_force_shared_crt option in CMake. TEST=all existing tests should still pass Review URL: http://codereview.chromium.org/3427004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59701 0039d316-1c4b-4281-b951-d872f2087c98
* Move helper_gmock.h from ChromFrame subrtee to testing directory.stoyan@google.com2009-10-271-0/+1
| | | | | | | | BUG=none TEST=builds ok Review URL: http://codereview.chromium.org/295049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30132 0039d316-1c4b-4281-b951-d872f2087c98
* Add comments setting emacs and vim tab width and expansion variables.sgk@google.com2009-10-061-0/+6
| | | | | | | | BUG=none TEST=successful builds Review URL: http://codereview.chromium.org/256059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28089 0039d316-1c4b-4281-b951-d872f2087c98
* Force inclusion of build/common.gypi for all chromium gyp files.yaar@chromium.org2009-09-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Why: Simpler build code. If everybody includes it, it should be included automatically. Why now: The webkit chromium builds need it be specified, since can't default to build/common.gypi. What was done: 1. build/common.gypi's contents were moved to a new file build/gyp_chromium.gypi 2. tools/gyp/gyp_chromium was moved to build/gyp_chromium and made to automatically include build/gyp_chromium.gypi. 3. lots of gyp files were fixed to not refer to build/common.gypi any more. 4. o3d which also builds independently of chrome, was fixed to have a gyp_o3d that includes gyp_chromium.gypi too. 5. build/common.gypi was left empty, because there are some external projects that still refer to it. Things that are left to do after this patch is in: 1. The following external files (in other repositories) need to stop include common.gypi ./third_party/hunspell/hunspell.gyp ./third_party/icu/icu.gyp ./v8/tools/gyp/v8.gyp 2. Once nobody refers to common.gypi anymore, delete common.gypi -or- Delete gyp_chromium.gypi and move its content back to common.gypi Tested on mac, win and linux. On win, got a few unit tests errors on chrome bookmarks, which should not be related. I'm running again with clobber to verify. Review URL: http://codereview.chromium.org/206006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26302 0039d316-1c4b-4281-b951-d872f2087c98
* Delete boost.ajwong@chromium.org2009-07-081-10/+0
| | | | | | Review URL: http://codereview.chromium.org/150086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20159 0039d316-1c4b-4281-b951-d872f2087c98
* Upgrade gtest to r267 and gmock to r173.ajwong@chromium.org2009-06-221-0/+1
| | | | | | | | | | This is step1 into removing the boost + tr1 dependency in windows. It also includes a hack to avoid brining in tr1/functional on gcc, which will move us closer to enabling -fno-rtti. This CL has passed the try servers. I've also tried compiling gmock, gmock_main, base, base_unittests, and webcore modules in vs2008 express editions. Review URL: http://codereview.chromium.org/140003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18923 0039d316-1c4b-4281-b951-d872f2087c98
* Fix msvs_guid for gmock and re-add gmock_unittest into base_unittest.ajwong@chromium.org2009-05-301-1/+1
| | | | | | | | | | | | The issue is that if there are lower case characters in the msvs_guid, incredibuild will silently ignore the target during a _command-line_ build. This issue does not affect builds in visual studio (incredibuild-based, or regular), but it does break the build bots. Review URL: http://codereview.chromium.org/118013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17267 0039d316-1c4b-4281-b951-d872f2087c98
* Retry to checkin a version of gmock, modified to use our boost_tuple in VS2005.ajwong@chromium.org2009-05-281-0/+78
| | | | | | | | | | 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
* Revert "Checkin a version of gmock, modified to use our boost_tuple in VS2005."ajwong@chromium.org2009-05-261-78/+0
| | | | | | This reverts commit 071e95bcdcefcd2cb86c9aed5cb073bbcaa7f2a7. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16931 0039d316-1c4b-4281-b951-d872f2087c98
* Checkin a version of gmock, modified to use our boost_tuple in VS2005.ajwong@chromium.org2009-05-261-0/+78
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