summaryrefslogtreecommitdiffstats
path: root/build/secondary/testing
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-08 07:57:23 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-08 07:58:58 +0000
commitd94a195ebeb384d72d775391bd5f2fff291be667 (patch)
treeb5cc9a8d870a0c64a5887f68e2736d0fbad16ab4 /build/secondary/testing
parent8c0ac804f0cbcfeda4034667ad9c0e4976805470 (diff)
downloadchromium_src-d94a195ebeb384d72d775391bd5f2fff291be667.zip
chromium_src-d94a195ebeb384d72d775391bd5f2fff291be667.tar.gz
chromium_src-d94a195ebeb384d72d775391bd5f2fff291be667.tar.bz2
Revert 288164 "Roll gtest and gmock DEPS."
Suspected to have broken the Chrome Win build: c:\b\build\slave\google-chrome-rel-win\build\src\base\numerics\safe_numerics_unittest.cc(577) : error C2220: warning treated as error - no 'object' file generated c:\b\build\slave\google-chrome-rel-win\build\src\base\numerics\safe_numerics_unittest.cc(577) : warning C4756: overflow in constant arithmetic > 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 TBR=ncbray@chromium.org Review URL: https://codereview.chromium.org/454823002 Cr-Commit-Position: refs/heads/master@{#288239} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/secondary/testing')
-rw-r--r--build/secondary/testing/gtest/BUILD.gn2
1 files changed, 0 insertions, 2 deletions
diff --git a/build/secondary/testing/gtest/BUILD.gn b/build/secondary/testing/gtest/BUILD.gn
index eb8604d..2c360fe 100644
--- a/build/secondary/testing/gtest/BUILD.gn
+++ b/build/secondary/testing/gtest/BUILD.gn
@@ -14,8 +14,6 @@ config("gtest_config") {
# 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",
]
# Gtest headers need to be able to find themselves.