Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump googletest for compatibility with clang-cl #13161

Merged
merged 4 commits into from
Sep 21, 2020
Merged

Bump googletest for compatibility with clang-cl #13161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7aac48f
Bump googletest for compatibility with clang-cl
wrowe Sep 17, 2020
58fe966
Fix compilation
sunjayBhatia Sep 18, 2020
c736033
Merge remote-tracking branch 'origin/master' into update-googletest
wrowe Sep 18, 2020
6f2421d
Clarify reason for electing a non-release point per DEPENDENCY_POLICY
wrowe Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,10 +433,13 @@ DEPENDENCY_REPOSITORIES_SPEC = dict(
com_google_googletest = dict(
project_name = "Google Test",
project_url = "https://github.com/google/googletest",
version = "1.10.0",
sha256 = "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
strip_prefix = "googletest-release-{version}",
urls = ["https://github.com/google/googletest/archive/release-{version}.tar.gz"],
# Pick up fix for MOCK_METHOD compilation with clang-cl for Windows (resolved after 1.10.0)
# see https://github.com/google/googletest/issues/2490
# 2020-09-10
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the update. Please include an explanation as per policy, see https://github.com/envoyproxy/envoy/blob/master/DEPENDENCY_POLICY.md

Versions should prefer release versions over master branch GitHub SHA tarballs. A comment is necessary if the latter is used. This comment should contain the reason that a non-release version is being used and the YYYY-MM-DD when the last update was performed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wrowe ping can you add the comment?

/wait

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, I had misunderstood the exception r.e. CPE's and test-only elements of the build, but hope you find the new message appropriate. Not really certain if there will be a 1.11 "release" given the general google philosophy of consuming the dev branch, and with respect to our test architecture, any of their bleed efforts to identify defects should be picked up fairly frequently (although probably not daily.)

version = "a4ab0abb93620ce26efad9de9296b73b16e88588",
sha256 = "7897bfaa5ad39a479177cfb5c3ce010184dbaee22a7c3727b212282871918751",
strip_prefix = "googletest-{version}",
urls = ["https://github.com/google/googletest/archive/{version}.tar.gz"],
use_category = ["test"],
),
com_google_protobuf = dict(
Expand Down
1 change: 1 addition & 0 deletions test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

using testing::AtLeast;
using testing::ByMove;
using testing::DoAll;
using testing::InSequence;
using testing::InvokeWithoutArgs;
using testing::Return;
Expand Down