netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Wrap all GetSocketPairs() in unnamed namespaces

Browse Source 
This avoids conflicting definitions of GetSocketPairs() in outer namespace when
multiple such cc files are complied for one binary.

PiperOrigin-RevId: 292420885
This commit is contained in:
Jay Zhuang
2020-01-30 14:17:58 -08:00
committed by gVisor bot
parent d62362f63f
commit 9988cf2eef
20 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/syscalls/linux/socket_abstract.cc
+2
View File
@@ -23,6 +23,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return ApplyVec<SocketPairKind>(
@@ -43,5 +44,6 @@ INSTANTIATE_TEST_SUITE_P(
AbstractUnixSockets, UnixSocketPairCmsgTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_filesystem.cc
+2
View File
@@ -23,6 +23,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return ApplyVec<SocketPairKind>(
@@ -43,5 +44,6 @@ INSTANTIATE_TEST_SUITE_P(
FilesystemUnixSockets, UnixSocketPairCmsgTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_ip_tcp_generic_loopback.cc
+2
View File
@@ -23,6 +23,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return ApplyVecToVec<SocketPairKind>(
@@ -39,5 +40,6 @@ INSTANTIATE_TEST_SUITE_P(
AllTCPSockets, TCPSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_ip_tcp_loopback_blocking.cc
+2
View File
@@ -23,6 +23,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return ApplyVecToVec<SocketPairKind>(
@@ -39,5 +40,6 @@ INSTANTIATE_TEST_SUITE_P(
BlockingTCPSockets, BlockingStreamSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_ip_tcp_loopback_nonblock.cc
+2
View File
@@ -23,6 +23,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return ApplyVecToVec<SocketPairKind>(
@@ -38,5 +39,6 @@ INSTANTIATE_TEST_SUITE_P(
NonBlockingTCPSockets, NonBlockingSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_ip_udp_loopback.cc
+2
View File
@@ -23,6 +23,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return {
@@ -44,5 +45,6 @@ INSTANTIATE_TEST_SUITE_P(
AllUDPSockets, UDPSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_ip_udp_loopback_blocking.cc
+2
View File
@@ -21,6 +21,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return {
@@ -33,5 +34,6 @@ INSTANTIATE_TEST_SUITE_P(
BlockingUDPSockets, BlockingNonStreamSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_ip_udp_loopback_nonblock.cc
+2
View File
@@ -21,6 +21,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return {
@@ -33,5 +34,6 @@ INSTANTIATE_TEST_SUITE_P(
NonBlockingUDPSockets, NonBlockingSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_unix_abstract_nonblock.cc
+2
View File
@@ -21,6 +21,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return ApplyVec<SocketPairKind>(
@@ -33,5 +34,6 @@ INSTANTIATE_TEST_SUITE_P(
NonBlockingAbstractUnixSockets, NonBlockingSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_unix_blocking_local.cc
+2
View File
@@ -21,6 +21,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return VecCat<SocketPairKind>(
@@ -39,5 +40,6 @@ INSTANTIATE_TEST_SUITE_P(
NonBlockingUnixDomainSockets, BlockingSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_unix_dgram_local.cc
+2
View File
@@ -23,6 +23,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return VecCat<SocketPairKind>(VecCat<SocketPairKind>(
@@ -52,5 +53,6 @@ INSTANTIATE_TEST_SUITE_P(
DgramUnixSockets, NonStreamSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_unix_domain.cc
+2
View File
@@ -21,6 +21,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return ApplyVec<SocketPairKind>(
@@ -33,5 +34,6 @@ INSTANTIATE_TEST_SUITE_P(
AllUnixDomainSockets, AllSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_unix_filesystem_nonblock.cc
+2
View File
@@ -21,6 +21,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return ApplyVec<SocketPairKind>(
@@ -33,5 +34,6 @@ INSTANTIATE_TEST_SUITE_P(
NonBlockingFilesystemUnixSockets, NonBlockingSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_unix_non_stream_blocking_local.cc
+2
View File
@@ -21,6 +21,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return VecCat<SocketPairKind>(
@@ -36,5 +37,6 @@ INSTANTIATE_TEST_SUITE_P(
BlockingNonStreamUnixSockets, BlockingNonStreamSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_unix_pair.cc
+2
View File
@@ -22,6 +22,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return VecCat<SocketPairKind>(ApplyVec<SocketPairKind>(
@@ -38,5 +39,6 @@ INSTANTIATE_TEST_SUITE_P(
AllUnixDomainSockets, UnixSocketPairCmsgTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_unix_pair_nonblock.cc
+2
View File
@@ -21,6 +21,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return ApplyVec<SocketPairKind>(
@@ -33,5 +34,6 @@ INSTANTIATE_TEST_SUITE_P(
NonBlockingUnixSockets, NonBlockingSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_unix_seqpacket_local.cc
+2
View File
@@ -23,6 +23,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return VecCat<SocketPairKind>(VecCat<SocketPairKind>(
@@ -52,5 +53,6 @@ INSTANTIATE_TEST_SUITE_P(
SeqpacketUnixSockets, UnixNonStreamSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_unix_stream_blocking_local.cc
+2
View File
@@ -21,6 +21,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return {
@@ -34,5 +35,6 @@ INSTANTIATE_TEST_SUITE_P(
BlockingStreamUnixSockets, BlockingStreamSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_unix_stream_local.cc
+2
View File
@@ -21,6 +21,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return VecCat<SocketPairKind>(
@@ -42,5 +43,6 @@ INSTANTIATE_TEST_SUITE_P(
StreamUnixSockets, StreamSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor
test/syscalls/linux/socket_unix_stream_nonblock_local.cc
+2
View File
@@ -20,6 +20,7 @@
namespace gvisor {
namespace testing {
namespace {
std::vector<SocketPairKind> GetSocketPairs() {
return {
@@ -33,5 +34,6 @@ INSTANTIATE_TEST_SUITE_P(
NonBlockingStreamUnixSockets, NonBlockingStreamSocketPairTest,
::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
} // namespace
} // namespace testing
} // namespace gvisor