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>
diff --git a/DEPS b/DEPS
index d7e9be8..410d7bb 100644
--- a/DEPS
+++ b/DEPS
@@ -22,7 +22,7 @@
'cygwin_revision': 'c89e446b273697fadf3a10ff1007a97c0b7de6df',
'depot_tools_revision': '869a2857a4f3acc08fdec6182ecec5b73593be3b',
'freetype_revision': '2157d8fa6f7e12063ca166476ed2223d24234db7',
- 'gtest_revision': 'a325ad2db5deb623eab740527e559b81c0f39d65',
+ 'gtest_revision': '4bd8c4638ada823a8da2569735cc0a9402fb8052',
'icu_revision': 'd888fd2a1be890f4d35e43f68d6d79f42519a357',
'instrumented_lib_revision': '323cf32193caecbf074d1a0cb5b02b905f163e0f',
'jinja2_revision': 'd34383206fa42d52faa10bb9931d6d538f3a57e0',
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn
index d04d804..e2b4bd6 100644
--- a/third_party/googletest/BUILD.gn
+++ b/third_party/googletest/BUILD.gn
@@ -14,13 +14,12 @@
# 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 1b3626c..efbb229 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