diff options
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | build/secondary/testing/gtest/BUILD.gn | 2 | ||||
| -rw-r--r-- | native_client_sdk/src/libraries/gmock/library.dsc | 1 | ||||
| -rw-r--r-- | testing/gtest.gyp | 3 |
4 files changed, 8 insertions, 2 deletions
@@ -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"), diff --git a/build/secondary/testing/gtest/BUILD.gn b/build/secondary/testing/gtest/BUILD.gn index 2c360fe..eb8604d 100644 --- a/build/secondary/testing/gtest/BUILD.gn +++ b/build/secondary/testing/gtest/BUILD.gn @@ -14,6 +14,8 @@ 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 074d131..8b685a5 100644 --- a/native_client_sdk/src/libraries/gmock/library.dsc +++ b/native_client_sdk/src/libraries/gmock/library.dsc @@ -37,6 +37,7 @@ '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 e2dc66a..f4577df 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -55,10 +55,13 @@ # 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': [ |