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
This commit is contained in:
4
DEPS
4
DEPS
@@ -100,10 +100,10 @@ deps = {
|
|||||||
(Var("googlecode_url") % "open-vcdiff") + "/trunk@42",
|
(Var("googlecode_url") % "open-vcdiff") + "/trunk@42",
|
||||||
|
|
||||||
"src/testing/gtest":
|
"src/testing/gtest":
|
||||||
(Var("googlecode_url") % "googletest") + "/trunk@643",
|
(Var("googlecode_url") % "googletest") + "/trunk@692",
|
||||||
|
|
||||||
"src/testing/gmock":
|
"src/testing/gmock":
|
||||||
(Var("googlecode_url") % "googlemock") + "/trunk@410",
|
(Var("googlecode_url") % "googlemock") + "/trunk@485",
|
||||||
|
|
||||||
"src/third_party/angle":
|
"src/third_party/angle":
|
||||||
Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"),
|
Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"),
|
||||||
|
@@ -14,6 +14,8 @@ config("gtest_config") {
|
|||||||
# In order to allow regex matches in gtest to be shared between Windows
|
# 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.
|
# and other systems, we tell gtest to always use it's internal engine.
|
||||||
"GTEST_HAS_POSIX_RE=0",
|
"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.
|
# Gtest headers need to be able to find themselves.
|
||||||
|
@@ -37,6 +37,7 @@
|
|||||||
'gmock.h',
|
'gmock.h',
|
||||||
'gmock-matchers.h',
|
'gmock-matchers.h',
|
||||||
'gmock-more-actions.h',
|
'gmock-more-actions.h',
|
||||||
|
'gmock-more-matchers.h',
|
||||||
'gmock-spec-builders.h',
|
'gmock-spec-builders.h',
|
||||||
],
|
],
|
||||||
'DEST': 'include/gmock',
|
'DEST': 'include/gmock',
|
||||||
|
@@ -55,10 +55,13 @@
|
|||||||
# In order to allow regex matches in gtest to be shared between Windows
|
# 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.
|
# and other systems, we tell gtest to always use it's internal engine.
|
||||||
'GTEST_HAS_POSIX_RE=0',
|
'GTEST_HAS_POSIX_RE=0',
|
||||||
|
# Chrome doesn't support / require C++11, yet.
|
||||||
|
'GTEST_LANG_CXX11=0',
|
||||||
],
|
],
|
||||||
'all_dependent_settings': {
|
'all_dependent_settings': {
|
||||||
'defines': [
|
'defines': [
|
||||||
'GTEST_HAS_POSIX_RE=0',
|
'GTEST_HAS_POSIX_RE=0',
|
||||||
|
'GTEST_LANG_CXX11=0',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
'conditions': [
|
'conditions': [
|
||||||
|
Reference in New Issue
Block a user