From 760a01337c2e05a224908fd6785809ca92a9f09f Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Tue, 23 Nov 2021 08:42:30 -0800 Subject: [PATCH] Added workaround for gcc 6.3.0 (#28184) --- .../core/address_utils/sockaddr_utils_test.cc | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/test/core/address_utils/sockaddr_utils_test.cc b/test/core/address_utils/sockaddr_utils_test.cc index 2c615f147e6..33c728bf4b5 100644 --- a/test/core/address_utils/sockaddr_utils_test.cc +++ b/test/core/address_utils/sockaddr_utils_test.cc @@ -182,16 +182,18 @@ TEST(SockAddrUtilsTest, SockAddrToString) { "[2001:db8::1%25101]:12345"); EXPECT_EQ(grpc_sockaddr_to_uri(&input6), "ipv6:[2001:db8::1%25101]:12345"); - input6 = MakeAddr6(kMapped, sizeof(kMapped)); - EXPECT_EQ(grpc_sockaddr_to_string(&input6, false), + grpc_resolved_address input6x = MakeAddr6(kMapped, sizeof(kMapped)); + EXPECT_EQ(grpc_sockaddr_to_string(&input6x, false), "[::ffff:192.0.2.1]:12345"); - EXPECT_EQ(grpc_sockaddr_to_string(&input6, true), "192.0.2.1:12345"); - EXPECT_EQ(grpc_sockaddr_to_uri(&input6), "ipv4:192.0.2.1:12345"); - - input6 = MakeAddr6(kNotQuiteMapped, sizeof(kNotQuiteMapped)); - EXPECT_EQ(grpc_sockaddr_to_string(&input6, false), "[::fffe:c000:263]:12345"); - EXPECT_EQ(grpc_sockaddr_to_string(&input6, true), "[::fffe:c000:263]:12345"); - EXPECT_EQ(grpc_sockaddr_to_uri(&input6), "ipv6:[::fffe:c000:263]:12345"); + EXPECT_EQ(grpc_sockaddr_to_string(&input6x, true), "192.0.2.1:12345"); + EXPECT_EQ(grpc_sockaddr_to_uri(&input6x), "ipv4:192.0.2.1:12345"); + + grpc_resolved_address input6y = + MakeAddr6(kNotQuiteMapped, sizeof(kNotQuiteMapped)); + EXPECT_EQ(grpc_sockaddr_to_string(&input6y, false), + "[::fffe:c000:263]:12345"); + EXPECT_EQ(grpc_sockaddr_to_string(&input6y, true), "[::fffe:c000:263]:12345"); + EXPECT_EQ(grpc_sockaddr_to_uri(&input6y), "ipv6:[::fffe:c000:263]:12345"); grpc_resolved_address phony; memset(&phony, 0, sizeof(phony));