summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-09 05:24:02 +0000
committerncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-09 05:24:02 +0000
commit8068fe638b43b0a908dd87cead86e44ebb646cbf (patch)
treef39fa0d9422300f07b56b8f65af3f0f7ea351c7e /DEPS
parent15627f7cc8846669cb8f96f1128f7aa65de77d8e (diff)
downloadchromium_src-8068fe638b43b0a908dd87cead86e44ebb646cbf.zip
chromium_src-8068fe638b43b0a908dd87cead86e44ebb646cbf.tar.gz
chromium_src-8068fe638b43b0a908dd87cead86e44ebb646cbf.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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 443847c..21f0b72 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@643",
+ (Var("googlecode_url") % "googletest") + "/trunk@692",
"src/testing/gmock":
- (Var("googlecode_url") % "googlemock") + "/trunk@410",
+ (Var("googlecode_url") % "googlemock") + "/trunk@485",
"src/third_party/angle":
Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"),