Commit ab9bbed9 authored by bmeurer@chromium.org's avatar bmeurer@chromium.org

Synchronize GTest/GMock dependencies with Chromium.

Dependencies were updated in Chromium, see
https://codereview.chromium.org/425333002/ for details.

R=svenpanne@chromium.org

Review URL: https://codereview.chromium.org/451993002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22984 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent c068a606
...@@ -16,9 +16,9 @@ deps = { ...@@ -16,9 +16,9 @@ deps = {
'v8/buildtools': 'v8/buildtools':
Var('git_url') + '/chromium/buildtools.git@fb782d4369d5ae04f17a2fceef7de5a63e50f07b', Var('git_url') + '/chromium/buildtools.git@fb782d4369d5ae04f17a2fceef7de5a63e50f07b',
'v8/testing/gmock': 'v8/testing/gmock':
Var('git_url') + '/external/googlemock.git@6b1759c3816d574bddde3e1725c51a811c8870e7', Var('git_url') + '/external/googlemock.git@896ba0e03f520fb9b6ed582bde2bd00847e3c3f2',
'v8/testing/gtest': 'v8/testing/gtest':
Var('git_url') + '/external/googletest.git@74de57c951aedebc5dfe26a27604353432392b98', Var('git_url') + '/external/googletest.git@4650552ff637bb44ecf7784060091cbed3252211',
'v8/third_party/icu': 'v8/third_party/icu':
Var('git_url') + '/chromium/deps/icu52.git@26d8859357ac0bfb86b939bf21c087b8eae22494', Var('git_url') + '/chromium/deps/icu52.git@26d8859357ac0bfb86b939bf21c087b8eae22494',
} }
...@@ -35,7 +35,8 @@ deps_os = { ...@@ -35,7 +35,8 @@ deps_os = {
include_rules = [ include_rules = [
'+include', '+include',
'+unicode' '+unicode',
'+third_party/fdlibm'
] ]
skip_child_includes = [ skip_child_includes = [
......
...@@ -21,10 +21,10 @@ deps = { ...@@ -21,10 +21,10 @@ deps = {
Var("buildtools_revision"), Var("buildtools_revision"),
"v8/testing/gtest": "v8/testing/gtest":
"http://googletest.googlecode.com/svn/trunk@643", "http://googletest.googlecode.com/svn/trunk@692",
"v8/testing/gmock": "v8/testing/gmock":
"http://googlemock.googlecode.com/svn/trunk@410", "http://googlemock.googlecode.com/svn/trunk@485",
} }
deps_os = { deps_os = {
......
...@@ -484,9 +484,9 @@ builddeps: ...@@ -484,9 +484,9 @@ builddeps:
third_party/icu --revision 277999 ; \ third_party/icu --revision 277999 ; \
fi fi
svn checkout --force http://googletest.googlecode.com/svn/trunk \ svn checkout --force http://googletest.googlecode.com/svn/trunk \
testing/gtest --revision 643 testing/gtest --revision 692
svn checkout --force http://googlemock.googlecode.com/svn/trunk \ svn checkout --force http://googlemock.googlecode.com/svn/trunk \
testing/gmock --revision 410 testing/gmock --revision 485
dependencies: builddeps dependencies: builddeps
# The spec is a copy of the hooks in v8's DEPS file. # The spec is a copy of the hooks in v8's DEPS file.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment