diff options
| author | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-09 05:24:02 +0000 |
|---|---|---|
| committer | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-09 05:25:16 +0000 |
| commit | b6bf5c32ed8ee629c82110241608e9e60c35752d (patch) | |
| tree | f39fa0d9422300f07b56b8f65af3f0f7ea351c7e /testing/gtest.gyp | |
| parent | 97af9a268ab2a10eaa9199d52cae828f8206fc5f (diff) | |
| download | chromium_src-b6bf5c32ed8ee629c82110241608e9e60c35752d.zip chromium_src-b6bf5c32ed8ee629c82110241608e9e60c35752d.tar.gz chromium_src-b6bf5c32ed8ee629c82110241608e9e60c35752d.tar.bz2 | |
Roll gtest and gmock DEPS.
These DEPS have not been updated for ~2 years, so there is a good chance
something will blow up. Due to interdependancy between the repos,
rolling gtest required gmock also be rolled.
This CL was originally landed as 288164 and reverted as 288239 because it allows
more aggressive LTO in MSVS. This resulted in the compiler noticing an
intentional arithmetic overflow and warning about it.
BUG=401761
Review URL: https://codereview.chromium.org/425333002
Cr-Commit-Position: refs/heads/master@{#288505}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gtest.gyp')
| -rw-r--r-- | testing/gtest.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp index e2dc66a..f4577df 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -55,10 +55,13 @@ # In order to allow regex matches in gtest to be shared between Windows # and other systems, we tell gtest to always use it's internal engine. 'GTEST_HAS_POSIX_RE=0', + # Chrome doesn't support / require C++11, yet. + 'GTEST_LANG_CXX11=0', ], 'all_dependent_settings': { 'defines': [ 'GTEST_HAS_POSIX_RE=0', + 'GTEST_LANG_CXX11=0', ], }, 'conditions': [ |