From d94a195ebeb384d72d775391bd5f2fff291be667 Mon Sep 17 00:00:00 2001 From: "tommi@chromium.org" Date: Fri, 8 Aug 2014 07:57:23 +0000 Subject: [PATCH] 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 --- DEPS | 4 ++-- build/secondary/testing/gtest/BUILD.gn | 2 -- native_client_sdk/src/libraries/gmock/library.dsc | 1 - testing/gtest.gyp | 3 --- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/DEPS b/DEPS index 3c27929ef6fb..8c6bc46c44a3 100644 --- a/DEPS +++ b/DEPS @@ -100,10 +100,10 @@ deps = { (Var("googlecode_url") % "open-vcdiff") + "/trunk@42", "src/testing/gtest": - (Var("googlecode_url") % "googletest") + "/trunk@692", + (Var("googlecode_url") % "googletest") + "/trunk@643", "src/testing/gmock": - (Var("googlecode_url") % "googlemock") + "/trunk@485", + (Var("googlecode_url") % "googlemock") + "/trunk@410", "src/third_party/angle": Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"), diff --git a/build/secondary/testing/gtest/BUILD.gn b/build/secondary/testing/gtest/BUILD.gn index eb8604dc153a..2c360fe8da05 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. diff --git a/native_client_sdk/src/libraries/gmock/library.dsc b/native_client_sdk/src/libraries/gmock/library.dsc index 8b685a59648f..074d13181995 100644 --- a/native_client_sdk/src/libraries/gmock/library.dsc +++ b/native_client_sdk/src/libraries/gmock/library.dsc @@ -37,7 +37,6 @@ 'gmock.h', 'gmock-matchers.h', 'gmock-more-actions.h', - 'gmock-more-matchers.h', 'gmock-spec-builders.h', ], 'DEST': 'include/gmock', diff --git a/testing/gtest.gyp b/testing/gtest.gyp index f4577df8d23b..e2dc66a21796 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -55,13 +55,10 @@ # 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': [ -- 2.11.4.GIT