diff options
| author | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 23:40:18 +0000 |
|---|---|---|
| committer | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 23:40:18 +0000 |
| commit | 24c2bd73f4114b2d6dd0467cd4f19fef363346de (patch) | |
| tree | 9d1cfdf4a0c0ddad0a172d7567f9b2aa933c2b13 /testing/gtest.gyp | |
| parent | 7ee5b51e0f2fe7a00d165035aefaca81ce422e1a (diff) | |
| download | chromium_src-24c2bd73f4114b2d6dd0467cd4f19fef363346de.zip chromium_src-24c2bd73f4114b2d6dd0467cd4f19fef363346de.tar.gz chromium_src-24c2bd73f4114b2d6dd0467cd4f19fef363346de.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.
BUG=none
Review URL: https://codereview.chromium.org/425333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288164 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': [ |