Skip to content

Commit

Permalink
Roll src/third_party/googletest/src/ 5ec7f0c4a..efecb0bfa (43 commits)
Browse files Browse the repository at this point in the history
https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/5ec7f0c4a113..efecb0bfa687

$ git log 5ec7f0c4a..efecb0bfa --date=short --no-merges --format='%ad %ae %s'
2019-02-25 absl-team Googletest export
2019-02-25 rsinnet Fix grammatical error in primer.md
2019-02-21 yaneurabeya Don't hardcode the filename in `CxxExceptionDeathTest.PrintsMessageForStdException`
2019-02-20 misterg Googletest export
2019-02-19 absl-team Googletest export
2019-02-20 dds Avoid array index out of range
2019-02-18 yaneurabeya Ignore `-Wsign-conversion` issues
2019-02-13 yaneurabeya Fix clang `-Wunused-parameter` warnings
2019-02-13 yaneurabeya Fix clang `-Winconsistent-missing-override` warnings
2019-02-13 yaneurabeya Fix clang `-Winconsistent-missing-override` warnings
2019-02-13 yaneurabeya Add `cxx_strict_flags` for clang to match FreeBSD's WARNS flags
2019-02-12 yaneurabeya Import `patch-bsd-defines` from FreeBSD ports [1]
2019-02-12 yaneurabeya Compile clang with `-Wall -Wshadow -Werror`
2019-02-12 yaneurabeya Fix -Wunused-private-field issues with clang
2019-02-12 misterg Googletest export
2019-02-07 absl-team Googletest export
2019-02-05 absl-team Googletest export
2019-02-04 absl-team Googletest export
2018-02-10 knut.omang Set gtest version correctly for older cmake versions
2018-02-25 knut.omang Generate a libgtest.la to help libtool managing dependencies
2016-12-23 jwakely Stop TestInfo::Run() calling a function through null pointer
2019-02-05 chrisjohnsonmail fix:  Correct *-all.cc file paths
2019-02-05 keiichiw Fix an invalid example of JSON report in advanced.md
2019-02-04 gennadiycivil Update .travis.yml
2019-02-04 gennadiycivil Update .travis.yml
2019-01-12 yaneurabeya Test out changes with clang/OSX each PR using Travis CI
2019-02-04 misterg Googletest export
2019-02-04 misterg Googletest export
2019-02-01 absl-team Googletest export
2019-02-04 maetugr cmake: detect Cygwin which needs extensions to build
2019-02-04 maetugr cmake: move global project definition to beginning
2019-01-31 absl-team Googletest export
2019-02-01 chrisjohnsonmail chore: Add PlatformIO supported platforms list
2019-01-31 chrisjohnsonmail fix: Add Arduino to embedded platform list
2019-01-31 chrisjohnsonmail fix: Add *_all.cc files to ignore list
2019-01-31 g4691821 Fix README.md broken link
2019-01-30 gennadiycivil Repeat #2090
2019-01-30 Kelly_G_Walker Update advanced.md casing in example
2019-01-29 gennadiycivil Added -Wgnu-zero-variadic-macro-arguments" clang
2019-01-28 hugo.lindstrom Avoid dynamic/static runtime linking (LNK4098) by properly replacing MD(d)->MT(d) in both C and CXX flags, resolves 2074
2019-01-22 samolisov Enable CI on Windows (appveyor) with Bazel
2019-01-18 mathbunnyru Fix INSTANTIATE_TEST_CASE_P with zero variadic arguments
2019-01-14 samolisov Enable building as a shared library (dll) on Windows with Bazel

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

Also temporarily disable Googletest deprecation warnings in
//third_party/boringssl and //third_party/libaddressinput until they
migrate their usage of deprecated APIs.

Also replace _TEST_CASE_ with _TEST_SUITE_.

Bug: 925652, 936691
Change-Id: I50fb3811b067453d04dc2b2f739b27141c0951b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1497355
Auto-Submit: Staphany Park <staphany@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Victor Costan <pwnall@chromium.org>
Commit-Queue: Staphany Park <staphany@chromium.org>
Cr-Commit-Position: refs/heads/master@{#637550}
  • Loading branch information
Staphany Park authored and Commit Bot committed Mar 5, 2019
1 parent 4cfdaca commit 2cf208c
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 20 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ deps = {
},

'src/third_party/googletest/src':
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081',
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'efecb0bfa687cf87836494f5d62868485c00fb66',

# GNU binutils assembler for x86-32.
'src/third_party/gnu_binutils': {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ IN_PROC_BROWSER_TEST_P(ExtensionIncomingNativeMessagingTest,

} // namespace

INSTANTIATE_TEST_CASE_P(,
ExtensionIncomingNativeMessagingTest,
testing::Values(BindingsType::kNative,
BindingsType::kJavaScript));
INSTANTIATE_TEST_SUITE_P(,
ExtensionIncomingNativeMessagingTest,
testing::Values(BindingsType::kNative,
BindingsType::kJavaScript));
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ TEST_P(AssociatedUserValidatorUserAccessBlockingTest,
GetMachineRegDWORD(kWinlogonUserListRegKey, username, &reg_value));
}

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
,
AssociatedUserValidatorUserAccessBlockingTest,
::testing::Combine(::testing::Values(CPUS_INVALID,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -386,11 +386,11 @@ TEST_P(GcpCredentialProviderWithGaiaUsersTest, ReauthCredentialTest) {
}
}

INSTANTIATE_TEST_CASE_P(,
GcpCredentialProviderWithGaiaUsersTest,
::testing::Combine(::testing::Bool(),
::testing::Bool(),
::testing::Bool()));
INSTANTIATE_TEST_SUITE_P(,
GcpCredentialProviderWithGaiaUsersTest,
::testing::Combine(::testing::Bool(),
::testing::Bool(),
::testing::Bool()));

// Check that the correct reauth credential type is created based on various
// policy settings as well as usage scenarios.
Expand Down Expand Up @@ -557,7 +557,7 @@ TEST_P(GcpCredentialProviderAvailableCredentialsTest, AvailableCredentials) {
}
}

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
,
GcpCredentialProviderAvailableCredentialsTest,
::testing::Combine(::testing::Bool(),
Expand Down
2 changes: 1 addition & 1 deletion gpu/command_buffer/service/multi_draw_manager_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ TEST_P(MultiDrawManagerTest, ElementTypeMismatch) {
EXPECT_FALSE(DoMultiDraw(50, GL_TRIANGLES, GL_UNSIGNED_SHORT));
}

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
,
MultiDrawManagerTest,
testing::Combine(
Expand Down
10 changes: 10 additions & 0 deletions third_party/boringssl/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,11 @@ test("boringssl_crypto_tests") {
sources += [ "gtest_main_chromium.cc" ]
deps += [ "//base/test:test_support" ]
}

# TODO(crbug.com/936651): Remove this after fixing deprecated API usage.
if (is_clang) {
cflags = [ "-Wno-deprecated-declarations" ]
}
}

test("boringssl_ssl_tests") {
Expand All @@ -189,6 +194,11 @@ test("boringssl_ssl_tests") {
sources += [ "gtest_main_chromium.cc" ]
deps += [ "//base/test:test_support" ]
}

# TODO(crbug.com/936651): Remove this after fixing deprecated API usage.
if (is_clang) {
cflags = [ "-Wno-deprecated-declarations" ]
}
}

if (build_with_chromium) {
Expand Down
1 change: 0 additions & 1 deletion third_party/googletest/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ source_set("gtest") {
"src/googletest/include/gtest/internal/gtest-death-test-internal.h",
"src/googletest/include/gtest/internal/gtest-filepath.h",
"src/googletest/include/gtest/internal/gtest-internal.h",
"src/googletest/include/gtest/internal/gtest-param-util-generated.h",
"src/googletest/include/gtest/internal/gtest-param-util.h",
"src/googletest/include/gtest/internal/gtest-port-arch.h",
"src/googletest/include/gtest/internal/gtest-port.h",
Expand Down
2 changes: 1 addition & 1 deletion third_party/googletest/README.chromium
Original file line number Diff line number Diff line change
@@ -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-5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081
Version: 1.8.0.git-efecb0bfa687cf87836494f5d62868485c00fb66
License: BSD
License File: NOT_SHIPPED
Security critical: no
Expand Down
9 changes: 7 additions & 2 deletions third_party/libaddressinput/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//testing/test.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
import("//build/config/locales.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni")
import("//tools/grit/grit_rule.gni")

config("internal_config") {
Expand Down Expand Up @@ -267,6 +267,11 @@ test("libaddressinput_unittests") {

include_dirs = [ "src/cpp/src" ]

# TODO(crbug.com/936653): Remove this after fixing deprecated API usage.
if (is_clang) {
cflags = [ "-Wno-deprecated-declarations" ]
}

deps = [
":libaddressinput",
":strings",
Expand Down
6 changes: 3 additions & 3 deletions ui/display/manager/display_change_observer_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ TEST_P(DisplayChangeObserverTest,
}
}

INSTANTIATE_TEST_CASE_P(,
DisplayChangeObserverTest,
::testing::Values(false, true));
INSTANTIATE_TEST_SUITE_P(,
DisplayChangeObserverTest,
::testing::Values(false, true));

} // namespace display

0 comments on commit 2cf208c

Please sign in to comment.