summaryrefslogtreecommitdiff
path: root/third_party/googletest
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-04-25 18:13:21 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-04-25 18:13:21 +0000
commit00721f053a1f0b47370d86a60356c4560e92ddf2 (patch)
tree6526caf5ade0342f7f31e91fb3020cdb61256f8e /third_party/googletest
parent537f4c7b592a6981f9686297496cb23b461dfd5e (diff)
downloadpdfium-00721f053a1f0b47370d86a60356c4560e92ddf2.tar.xz
Roll third_party/googletest/src/ a325ad2db..4bd8c4638 (125 commits)
https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/a325ad2db5de..4bd8c4638ada Created with: roll-dep third_party/googletest/src Change-Id: I963e0b39119ab564754a81d20c38b5641b9230b5 Reviewed-on: https://pdfium-review.googlesource.com/31130 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/googletest')
-rw-r--r--third_party/googletest/BUILD.gn9
-rw-r--r--third_party/googletest/README.pdfium2
2 files changed, 5 insertions, 6 deletions
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn
index d04d804046..e2b4bd6a9d 100644
--- a/third_party/googletest/BUILD.gn
+++ b/third_party/googletest/BUILD.gn
@@ -14,13 +14,12 @@ 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 its internal engine.
"GTEST_HAS_POSIX_RE=0",
+
+ # Enables C++11 features.
"GTEST_LANG_CXX11=1",
- # ::testing::Combine, which is heavily used in Chromium, is gated on
- # tr1::tuple. Upstream avoids using tr1::tuple on Visual Studio 2017+,
- # because it causes warnings. We'll take (and ignore) the warnings to keep
- # our ::testing::Combine.
- "GTEST_HAS_TR1_TUPLE=1",
+ # Prevents gtest from including both <tr1/tuple> and <tuple>.
+ "GTEST_HAS_TR1_TUPLE=0",
]
# Gtest headers need to be able to find themselves.
diff --git a/third_party/googletest/README.pdfium b/third_party/googletest/README.pdfium
index 1b3626cf4b..efbb22950d 100644
--- a/third_party/googletest/README.pdfium
+++ b/third_party/googletest/README.pdfium
@@ -1,7 +1,7 @@
Name: Google Test: Google's C++ Testing Framework
Short Name: googletest
URL: https://github.com/google/googletest.git
-Version: 1.8.0.git-7d15497f7538fb531d0f025929d080743af421ee
+Version: 1.8.0.git-4bd8c4638ada823a8da2569735cc0a9402fb8052
License: BSD
License File: NOT_SHIPPED
Security critical: no