diff options
author | Jamie Liu <jamieliu@google.com> | 2019-01-25 13:34:19 -0800 |
---|---|---|
committer | Shentubot <shentubot@google.com> | 2019-01-25 13:35:32 -0800 |
commit | 876b241fac98e1e23f25ea4ccdca7768e0a7877f (patch) | |
tree | 33e36e7889e58f2bb0ef678bf753f95422b0182d /test/syscalls/linux/socket_ip_tcp_generic_loopback.cc | |
parent | cc995207531965b70bc1b812a70b91f242a92086 (diff) |
Remove O_CLOEXEC from socket test configurations where irrelevant.
The implementation of O_CLOEXEC is orthogonal to every property tested
by these tests; removing it significantly reduces the number of
redundant tests we run.
Also remove no-op calls to VecCat (calls with a single argument).
PiperOrigin-RevId: 230959537
Change-Id: I83fe7db24e481ef67ca1f1992228af423f640b5c
Diffstat (limited to 'test/syscalls/linux/socket_ip_tcp_generic_loopback.cc')
-rw-r--r-- | test/syscalls/linux/socket_ip_tcp_generic_loopback.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/test/syscalls/linux/socket_ip_tcp_generic_loopback.cc b/test/syscalls/linux/socket_ip_tcp_generic_loopback.cc index 9e10dea30..dc9a8c8d3 100644 --- a/test/syscalls/linux/socket_ip_tcp_generic_loopback.cc +++ b/test/syscalls/linux/socket_ip_tcp_generic_loopback.cc @@ -27,16 +27,11 @@ std::vector<SocketPairKind> GetSocketPairs() { return ApplyVecToVec<SocketPairKind>( std::vector<Middleware>{ NoOp, SetSockOpt(IPPROTO_TCP, TCP_NODELAY, &kSockOptOn)}, - VecCat<SocketPairKind>( - ApplyVec<SocketPairKind>( - IPv6TCPAcceptBindSocketPair, - AllBitwiseCombinations(List<int>{0, SOCK_CLOEXEC})), - ApplyVec<SocketPairKind>( - IPv4TCPAcceptBindSocketPair, - AllBitwiseCombinations(List<int>{0, SOCK_CLOEXEC})), - ApplyVec<SocketPairKind>( - DualStackTCPAcceptBindSocketPair, - AllBitwiseCombinations(List<int>{0, SOCK_CLOEXEC})))); + std::vector<SocketPairKind>{ + IPv6TCPAcceptBindSocketPair(0), + IPv4TCPAcceptBindSocketPair(0), + DualStackTCPAcceptBindSocketPair(0), + }); } INSTANTIATE_TEST_CASE_P( |