From 7aac48f5fb637ddf37fd97007b67803e80f7c1fe Mon Sep 17 00:00:00 2001 From: William A Rowe Jr Date: Thu, 17 Sep 2020 17:07:01 -0400 Subject: [PATCH 1/3] Bump googletest for compatibility with clang-cl - Submitting this independently to determine that this revision of googletest does not introduce breakage on any toolchain - See issue: https://github.com/google/googletest/issues/2490 Co-authored-by: Sunjay Bhatia Co-authored-by: William A Rowe Jr Signed-off-by: Sunjay Bhatia Signed-off-by: William A Rowe Jr --- bazel/repository_locations.bzl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index c178cc7a6ea6..13979589dd33 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -433,10 +433,11 @@ 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"], + # 2020-09-10 + 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( From 58fe9662d34e17443921753d1220e34739365813 Mon Sep 17 00:00:00 2001 From: Sunjay Bhatia Date: Fri, 18 Sep 2020 09:45:38 -0400 Subject: [PATCH 2/3] Fix compilation Signed-off-by: Sunjay Bhatia --- test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc b/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc index c7676e7ebc8b..d396126c1dcc 100644 --- a/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc +++ b/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc @@ -21,6 +21,7 @@ using testing::AtLeast; using testing::ByMove; +using testing::DoAll; using testing::InSequence; using testing::InvokeWithoutArgs; using testing::Return; From 6f2421db010d4393d0e41f9d38cdf46c0ea02f31 Mon Sep 17 00:00:00 2001 From: William A Rowe Jr Date: Fri, 18 Sep 2020 19:32:43 -0400 Subject: [PATCH 3/3] Clarify reason for electing a non-release point per DEPENDENCY_POLICY Signed-off-by: William A Rowe Jr --- bazel/repository_locations.bzl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index c44824442c0e..6d5fd2dc6a4e 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -433,6 +433,8 @@ DEPENDENCY_REPOSITORIES_SPEC = dict( com_google_googletest = dict( project_name = "Google Test", project_url = "https://github.com/google/googletest", + # 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 version = "a4ab0abb93620ce26efad9de9296b73b16e88588", sha256 = "7897bfaa5ad39a479177cfb5c3ce010184dbaee22a7c3727b212282871918751",