Skip to content

GitLab

T
tangled
Commit b289091f authored by Victor Costan's avatar Victor Costan Committed by Commit Bot
Browse files
Options

Roll src/third_party/googletest/src/ 0062e4869..7a2563a51 (65 commits) 

https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/0062e4869f07..7a2563a51456

This is a less ambitions reland of https://crrev.com/c/900544 which was
reverted because it broke net_unittests on Windows Debug builds
https://crbug.com/810347. A full roll is blocked on solving a complex
issue documented in the attached bug. In the meantime, this roll reduces
the gap between Chrome and upstream.

$ git log 0062e4869..7a2563a51 --date=short --no-merges --format='%ad %ae %s'
2018-01-24 misterg revert, lets get this compiled
2018-01-23 misterg Many code merge/upstream changes
2018-01-23 misterg Merging, upstream http://cl/182836545
2018-01-22 misterg more code merge
2018-01-22 misterg merges, cl/155419551 and other
2018-01-22 misterg more merging
2018-01-22 misterg merging
2018-01-22 misterg code merge
2018-01-18 misterg Adding python tests to Bazel build file.
2018-01-18 ftrushkin Use fully qualified  in examples
2018-01-18 ftrushkin Document ScopedTrace utility
2018-01-11 pcc Check whether _MSC_VER is defined when detecting presence of cxxabi.h under libc++.
2018-01-17 ftrushkin Expose ScopedTrace utility in public interface
2018-01-15 misterg Reverting some changes, need to make the merge compile
2018-01-15 misterg Reverting some changes, need to make the merge compile
2018-01-15 misterg Reverting some changes, need to make the merge compile
2018-01-15 misterg Reverting some changes, need to make the merge compile
2018-01-15 misterg Test files for corresponding changes
2018-01-15 misterg Test files for corresponding changes
2018-01-15 misterg Test files for corresponding changes
2018-01-15 misterg Test files for corresponding changes
2018-01-15 misterg More code merges
2018-01-15 misterg Code merging
2017-08-14 gaspard.petit Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
2017-08-14 gaspard.petit Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
2018-01-11 misterg continue upstream/merge, etc
2018-01-11 gennadiycivil Update .travis.yml
2018-01-11 gennadiycivil Update .travis.yml
2018-01-11 gennadiycivil Update .travis.yml
2018-01-11 gennadiycivil Update .travis.yml
2018-01-11 misterg Trying to fix travis
2018-01-11 misterg Upstream cl 103120214
2018-01-10 misterg More merge, cleanup
2018-01-10 misterg More merge, cleanup
2018-01-10 misterg Code merge, upstreaming accumulated changes, cleanup
2018-01-10 misterg revert
2018-01-10 misterg code merges, cleanup
2018-01-10 misterg revert googletest/test/gtest-param-test_test.cc
2018-01-10 gennadiycivil Update .travis.yml
2018-01-09 misterg code merge, cleanups
2018-01-09 misterg Upstream of cl 129104714
2018-01-09 misterg Revert one file
2018-01-09 misterg wip, cleanups/merge
2018-01-09 misterg cleanup, merge
2018-01-07 loorongjie [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
2018-01-08 misterg Small cleanups, merge
2018-01-05 coryan Use correct name for build event types.
2018-01-05 misterg Revert one file for now
2018-01-05 coryan Fixed test for pull request.
2018-01-05 coryan Fixed output and test for 'enabled_on_pr'
2018-01-04 misterg code cleanup in preparation for merges, cl 180857299
2018-01-04 coryan Optimize build matrix (#1)
2018-01-03 gennadiycivil upstreaming cl 124976692
2018-01-03 davidben Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.
2017-02-10 davidben Pass the -Wmissing-declarations warning.
2018-01-02 misterg OSS Sync, cl 163329677
2018-01-02 davidben Fix testing::Combine on MSVC 2017.
2017-05-06 davidben Avoid warning C4619 in MSVC 2017.
2017-12-24 coryan Build both googletest and googlemock.
2017-12-24 coryan Create a autotools-based build for Travis.
2016-05-18 gregory.pakosz Re-enable MSVC++ C4389 warning in CmdHelperEq()
2017-12-03 coryan Run autoconf from top-level directory.
2017-12-02 romain.geissler Fix double free when building Gtest/GMock in shared libraries and linking a test executable with both.
2017-08-14 gaspard.petit Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
2017-01-20 davidben Pass MSVC's C4826 warning.

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

Bug: 813219
Change-Id: Id9ff41aa6a1a099749e2a36f07ca93385796b9d0
Cq-Include-Trybots: master.tryserver.chromium.win:win_chrome_official;master.tryserver.chromium.linux:linux_chromium_msan_rel_ng;master.tryserver.chromium.linux:linux_chromium_tsan_rel_ng;master.tryserver.chromium.mac:mac_chromium_asan_rel_ng
Reviewed-on: https://chromium-review.googlesource.com/924844Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537837}
parent 9d967a75
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 19 deletions
DEPS
View file @ b289091f
......@@ -486,7 +486,7 @@ deps = {
},
'src/third_party/googletest/src':
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '0062e4869f07a3ef235703ddf63af604b712446c',
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '7a2563a514563145d82f02b5b350cba1af33af67',
# GNU binutils assembler for x86-32.
'src/third_party/gnu_binutils': {
......
base/test/gtest_util.h
View file @ b289091f
......@@ -33,24 +33,6 @@
#else
// DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID)
// Macro copied from gtest-death-test-internal.h as it's (1) internal for now
// and (2) only defined if !GTEST_HAS_DEATH_TEST which is only a subset of the
// conditions in which it's needed here.
// TODO(gab): Expose macro in upstream gtest repo for consumers like us that
// want more specific death tests and remove this hack.
#define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, terminator) \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
if (::testing::internal::AlwaysTrue()) { \
GTEST_LOG_(WARNING) \
<< "Death tests are not supported in this configuration.\n" \
<< "Statement '" #statement "' cannot be verified."; \
} else if (::testing::internal::AlwaysFalse()) { \
::testing::internal::RE::PartialMatch(".*", (regex)); \
GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
terminator; \
} else \
::testing::Message()
#define EXPECT_DCHECK_DEATH(statement) \
GTEST_UNSUPPORTED_DEATH_TEST(statement, "Check failed", )
#define ASSERT_DCHECK_DEATH(statement) \
......
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