diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-31 20:30:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:41 -0700 |
| commit | 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 (patch) | |
| tree | 382278a54ce7a744d62fa510a9a80688cc12434b /testing | |
| parent | c4becdd46e31d261b930e4b5a539cbc1d45c23a6 (diff) | |
| download | external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.zip external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.gz external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.bz2 | |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/README.chromium | 35 | ||||
| -rwxr-xr-x[-rw-r--r--] | testing/gmock/msvc/gmock-spec-builders_test.vcproj | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | testing/gmock/scripts/gmock-config.in | 0 |
3 files changed, 0 insertions, 35 deletions
diff --git a/testing/README.chromium b/testing/README.chromium deleted file mode 100644 index d6642ca..0000000 --- a/testing/README.chromium +++ /dev/null @@ -1,35 +0,0 @@ -We include a snapshot of gmock from http://googlemock.googlecode.com/svn/trunk. -(Why not pull from it directly via DEPS? Because it uses svn:externals, which -confuses gclient.) - -Current revision: 282 - - --- HOW TO USE -- - -If you are unfamiliar with gmock, there is an example of how to write a test -based on gmock in base/gmock_unittest.cc. To use gmock, just add a dependency -onto testing/gmock.gyp:gmock in your gyp target. - -For more general informaiton, there is a lot of good documentation availble on -the googlemock website: - - http://code.google.com/p/googlemock/ - -In particular, the "For Dummies" guide is a good place to start. The -"CheatSheet" and "CookBook" are better as references. - - --- RECREATING PACKAGE -- - -Example: - - svn export --ignore-externals \ - http://googlemock.googlecode.com/svn/trunk/ gmock - -When checking out a copy from svn, --ignore-externals should be used to avoid -getting an extra copy of gtest. - -This command will grab the head of trunk. Optionally, -r [revision number] to -can be passed to svn export if you want a specific revision. The current -revision of the source is listed at the top of the README. diff --git a/testing/gmock/msvc/gmock-spec-builders_test.vcproj b/testing/gmock/msvc/gmock-spec-builders_test.vcproj index 8440742..8440742 100644..100755 --- a/testing/gmock/msvc/gmock-spec-builders_test.vcproj +++ b/testing/gmock/msvc/gmock-spec-builders_test.vcproj diff --git a/testing/gmock/scripts/gmock-config.in b/testing/gmock/scripts/gmock-config.in index 9ce17a2..9ce17a2 100644..100755 --- a/testing/gmock/scripts/gmock-config.in +++ b/testing/gmock/scripts/gmock-config.in |