Commit 1e082189 authored by Victor Costan's avatar Victor Costan Committed by Commit Bot

Roll src/third_party/googletest/src/ 7e5f90d37..b640d8743 (50 commits)

This roll includes 1324e2d706d739217cceae361259a5cc01d1ff41 which fixes
the undefiend behavior breaking the Linux CFI bot introduced in
fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71.

https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/7e5f90d3780d..b640d8743d85

$ git log 7e5f90d37..b640d8743 --date=short --no-merges --format='%ad %ae %s'
2018-04-09 costan Remove multiple inheritance from "unintesting call" mock classes.
2018-04-11 misterg ...merging
2018-04-11 misterg merging
2018-04-11 misterg Upstream cl/192179348
2018-04-11 misterg merging
2018-04-11 misterg ..and this should be it
2018-04-11 misterg more
2018-04-11 misterg pizza work, cont
2018-04-11 misterg osx pizzas, cont
2018-04-11 misterg fixing osx pizza
2018-04-10 misterg merging
2018-04-10 misterg merging
2018-04-10 misterg merging
2018-04-10 misterg RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
2018-04-10 gennadiycivil Include gcc on mac into PR matrix
2018-04-09 gennadiycivil Revert "gmock actions 2"
2018-04-09 misterg ... and this
2018-04-09 misterg this should be it
2018-04-09 misterg yet more
2018-04-09 misterg formatting
2018-04-09 misterg tuning
2018-04-09 misterg tuning
2018-04-09 misterg more
2018-04-09 misterg cont
2018-04-09 misterg msvc
2018-04-09 misterg more msvc
2018-04-09 misterg msvc 14
2018-04-09 misterg testing msvc again
2018-04-09 misterg More msvc 14
2018-04-09 misterg And also silence for MSVS14
2018-04-09 misterg preproc syntax ( I can never remember it)
2018-04-09 misterg syntax
2018-04-09 misterg cont.
2018-04-09 misterg continued
2018-04-06 costan Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.
2018-04-06 misterg more mcvs fixing
2018-04-06 misterg linkage, fixing MSVC
2018-04-06 misterg fixing MSVC
2018-04-06 misterg more warnings
2018-04-06 misterg more warnings
2018-04-06 misterg more MSVC warnings
2018-04-06 misterg warnings
2018-04-06 misterg cont - 2
2018-04-06 misterg cont
2018-04-06 misterg more warnings
2018-04-06 misterg deal with MSVC warn, cont 1
2018-04-06 misterg Cont. deal with MCVS warnings
2018-04-06 misterg Deal with MCVS warnings
2018-04-06 misterg merging gmock-actions 2
2018-04-05 misterg Merging gMock, 2

Created with:
  roll-dep src/third_party/googletest/src

Bug: 830017, 829773
Change-Id: I2a20f5e12c1b0475e15c98251f9c3100247e14b9
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official;master.tryserver.chromium.linux:linux_chromium_cfi_rel_ng
Reviewed-on: https://chromium-review.googlesource.com/1004440Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Reviewed-by: default avatarChrome Cunningham <chcunningham@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550359}
parent 774d5e91
......@@ -580,7 +580,7 @@ deps = {
},
'src/third_party/googletest/src':
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '7e5f90d3780d553cb86771141fb81349f3a63508',
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'b640d8743d85f5e69c16679e7ead3f31d94e31ff',
# GNU binutils assembler for x86-32.
'src/third_party/gnu_binutils': {
......
......@@ -31,6 +31,7 @@ namespace media {
class MockProtocol : public FFmpegURLProtocol {
public:
MockProtocol() = default;
virtual ~MockProtocol() = default;
MOCK_METHOD2(Read, int(int size, uint8_t* data));
MOCK_METHOD1(GetPosition, bool(int64_t* position_out));
......
......@@ -15,8 +15,11 @@ config("gtest_config") {
# 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",
"GTEST_HAS_STD_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.
......
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