From ac8fca1ef44ee5ceb1fa454d52f41178a4d66f79 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Mon, 29 Apr 2019 11:32:48 -0700 Subject: Appease googletest deprecation PiperOrigin-RevId: 245788366 Change-Id: I17bbecf8493132dbe95564c34c45b838194bfabb --- test/syscalls/linux/accept_bind.cc | 2 +- test/syscalls/linux/accept_bind_stream.cc | 2 +- test/syscalls/linux/aio.cc | 10 +++++----- test/syscalls/linux/bind.cc | 2 +- test/syscalls/linux/chown.cc | 2 +- test/syscalls/linux/clock_gettime.cc | 10 +++++----- test/syscalls/linux/clock_nanosleep.cc | 4 ++-- test/syscalls/linux/exec_binary.cc | 4 ++-- test/syscalls/linux/futex.cc | 4 ++-- test/syscalls/linux/getdents.cc | 6 +++--- test/syscalls/linux/ioctl.cc | 4 ++-- test/syscalls/linux/mremap.cc | 4 ++-- test/syscalls/linux/msync.cc | 10 +++++----- test/syscalls/linux/proc.cc | 8 ++++---- test/syscalls/linux/proc_pid_uid_gid_map.cc | 12 ++++++------ test/syscalls/linux/ptrace.cc | 2 +- test/syscalls/linux/socket_abstract.cc | 4 ++-- test/syscalls/linux/socket_filesystem.cc | 4 ++-- test/syscalls/linux/socket_inet_loopback.cc | 13 +++++++------ test/syscalls/linux/socket_ip_loopback_blocking.cc | 2 +- test/syscalls/linux/socket_ip_tcp_generic_loopback.cc | 2 +- test/syscalls/linux/socket_ip_tcp_loopback.cc | 2 +- test/syscalls/linux/socket_ip_tcp_loopback_blocking.cc | 2 +- test/syscalls/linux/socket_ip_tcp_loopback_nonblock.cc | 2 +- test/syscalls/linux/socket_ip_tcp_udp_generic.cc | 2 +- test/syscalls/linux/socket_ip_udp_loopback.cc | 6 +++--- test/syscalls/linux/socket_ip_udp_loopback_blocking.cc | 2 +- test/syscalls/linux/socket_ip_udp_loopback_nonblock.cc | 2 +- .../socket_ipv4_tcp_unbound_external_networking_test.cc | 6 +++--- .../socket_ipv4_udp_unbound_external_networking_test.cc | 6 +++--- test/syscalls/linux/socket_ipv4_udp_unbound_loopback.cc | 4 ++-- test/syscalls/linux/socket_netlink_route.cc | 4 ++-- test/syscalls/linux/socket_unix_abstract.cc | 2 +- test/syscalls/linux/socket_unix_abstract_nonblock.cc | 2 +- test/syscalls/linux/socket_unix_blocking_local.cc | 2 +- test/syscalls/linux/socket_unix_dgram_local.cc | 6 +++--- test/syscalls/linux/socket_unix_dgram_non_blocking.cc | 2 +- test/syscalls/linux/socket_unix_domain.cc | 2 +- test/syscalls/linux/socket_unix_filesystem.cc | 2 +- test/syscalls/linux/socket_unix_filesystem_nonblock.cc | 2 +- .../syscalls/linux/socket_unix_non_stream_blocking_local.cc | 2 +- test/syscalls/linux/socket_unix_pair.cc | 2 +- test/syscalls/linux/socket_unix_pair_nonblock.cc | 2 +- test/syscalls/linux/socket_unix_seqpacket_local.cc | 6 +++--- test/syscalls/linux/socket_unix_stream.cc | 2 +- test/syscalls/linux/socket_unix_stream_blocking_local.cc | 2 +- test/syscalls/linux/socket_unix_stream_local.cc | 2 +- test/syscalls/linux/socket_unix_stream_nonblock_local.cc | 2 +- test/syscalls/linux/socket_unix_unbound_abstract.cc | 2 +- test/syscalls/linux/socket_unix_unbound_dgram.cc | 2 +- test/syscalls/linux/socket_unix_unbound_filesystem.cc | 2 +- test/syscalls/linux/socket_unix_unbound_seqpacket.cc | 2 +- test/syscalls/linux/socket_unix_unbound_stream.cc | 4 ++-- test/syscalls/linux/tcp_socket.cc | 8 ++++---- test/syscalls/linux/udp_bind.cc | 2 +- test/syscalls/linux/udp_socket.cc | 4 ++-- test/syscalls/linux/vdso_clock_gettime.cc | 6 +++--- test/syscalls/linux/wait.cc | 4 ++-- 58 files changed, 113 insertions(+), 112 deletions(-) (limited to 'test/syscalls/linux') diff --git a/test/syscalls/linux/accept_bind.cc b/test/syscalls/linux/accept_bind.cc index cd92003a6..c2bb4a7ce 100644 --- a/test/syscalls/linux/accept_bind.cc +++ b/test/syscalls/linux/accept_bind.cc @@ -580,7 +580,7 @@ TEST_P(AllSocketPairTest, BindAfterAcceptSenderAddr) { 0); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, AllSocketPairTest, ::testing::ValuesIn(VecCat( ApplyVec( diff --git a/test/syscalls/linux/accept_bind_stream.cc b/test/syscalls/linux/accept_bind_stream.cc index 8e6ef2bca..1501e526e 100644 --- a/test/syscalls/linux/accept_bind_stream.cc +++ b/test/syscalls/linux/accept_bind_stream.cc @@ -73,7 +73,7 @@ TEST_P(AllSocketPairTest, BoundSenderAddrCoalesced) { 0); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, AllSocketPairTest, ::testing::ValuesIn(VecCat( ApplyVec(FilesystemUnboundUnixDomainSocketPair, diff --git a/test/syscalls/linux/aio.cc b/test/syscalls/linux/aio.cc index cc5392223..06643ccb8 100644 --- a/test/syscalls/linux/aio.cc +++ b/test/syscalls/linux/aio.cc @@ -397,9 +397,9 @@ TEST_P(AIOReadWriteParamTest, BadOffset) { ASSERT_THAT(Submit(1, cbs), SyscallFailsWithErrno(EINVAL)); } -INSTANTIATE_TEST_CASE_P(BadOffset, AIOReadWriteParamTest, - ::testing::Values(IOCB_CMD_PREAD, IOCB_CMD_PWRITE, - IOCB_CMD_PREADV, IOCB_CMD_PWRITEV)); +INSTANTIATE_TEST_SUITE_P(BadOffset, AIOReadWriteParamTest, + ::testing::Values(IOCB_CMD_PREAD, IOCB_CMD_PWRITE, + IOCB_CMD_PREADV, IOCB_CMD_PWRITEV)); class AIOVectorizedParamTest : public AIOTest, public ::testing::WithParamInterface {}; @@ -426,8 +426,8 @@ TEST_P(AIOVectorizedParamTest, BadIOVecs) { ASSERT_THAT(Submit(1, cbs), SyscallFailsWithErrno(EFAULT)); } -INSTANTIATE_TEST_CASE_P(BadIOVecs, AIOVectorizedParamTest, - ::testing::Values(IOCB_CMD_PREADV, IOCB_CMD_PWRITEV)); +INSTANTIATE_TEST_SUITE_P(BadIOVecs, AIOVectorizedParamTest, + ::testing::Values(IOCB_CMD_PREADV, IOCB_CMD_PWRITEV)); } // namespace testing } // namespace gvisor diff --git a/test/syscalls/linux/bind.cc b/test/syscalls/linux/bind.cc index c16bd682e..f5aa9c500 100644 --- a/test/syscalls/linux/bind.cc +++ b/test/syscalls/linux/bind.cc @@ -126,7 +126,7 @@ TEST_P(AllSocketPairTest, Unbind) { ASSERT_THAT(close(sockets->release_second_fd()), SyscallSucceeds()); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, AllSocketPairTest, ::testing::ValuesIn(VecCat( ApplyVec( diff --git a/test/syscalls/linux/chown.cc b/test/syscalls/linux/chown.cc index aa1df05b1..ad892cf6a 100644 --- a/test/syscalls/linux/chown.cc +++ b/test/syscalls/linux/chown.cc @@ -160,7 +160,7 @@ PosixError errorFromReturn(const std::string& name, int ret) { return NoError(); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ChownKinds, ChownParamTest, ::testing::Values( [](const std::string& path, uid_t owner, gid_t group) -> PosixError { diff --git a/test/syscalls/linux/clock_gettime.cc b/test/syscalls/linux/clock_gettime.cc index dee66c5a8..4ecb5f5b1 100644 --- a/test/syscalls/linux/clock_gettime.cc +++ b/test/syscalls/linux/clock_gettime.cc @@ -132,11 +132,11 @@ std::string PrintClockId(::testing::TestParamInfo info) { } } -INSTANTIATE_TEST_CASE_P(ClockGettime, MonotonicClockTest, - ::testing::Values(CLOCK_MONOTONIC, - CLOCK_MONOTONIC_COARSE, - CLOCK_MONOTONIC_RAW), - PrintClockId); +INSTANTIATE_TEST_SUITE_P(ClockGettime, MonotonicClockTest, + ::testing::Values(CLOCK_MONOTONIC, + CLOCK_MONOTONIC_COARSE, + CLOCK_MONOTONIC_RAW), + PrintClockId); TEST(ClockGettime, UnimplementedReturnsEINVAL) { SKIP_IF(!IsRunningOnGvisor()); diff --git a/test/syscalls/linux/clock_nanosleep.cc b/test/syscalls/linux/clock_nanosleep.cc index 96bb961b4..61c67a5ff 100644 --- a/test/syscalls/linux/clock_nanosleep.cc +++ b/test/syscalls/linux/clock_nanosleep.cc @@ -123,8 +123,8 @@ TEST_P(WallClockNanosleepTest, SleepUntil) { EXPECT_GE(after, until); } -INSTANTIATE_TEST_CASE_P(Sleepers, WallClockNanosleepTest, - ::testing::Values(CLOCK_REALTIME, CLOCK_MONOTONIC)); +INSTANTIATE_TEST_SUITE_P(Sleepers, WallClockNanosleepTest, + ::testing::Values(CLOCK_REALTIME, CLOCK_MONOTONIC)); TEST(ClockNanosleepProcessTest, SleepFiveSeconds) { absl::Duration const kDuration = absl::Seconds(5); diff --git a/test/syscalls/linux/exec_binary.cc b/test/syscalls/linux/exec_binary.cc index cb5c7ae51..187696ed9 100644 --- a/test/syscalls/linux/exec_binary.cc +++ b/test/syscalls/linux/exec_binary.cc @@ -828,7 +828,7 @@ TEST_P(ElfInterpreterStaticTest, Test) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Cases, ElfInterpreterStaticTest, ::testing::ValuesIn({ // Simple NUL-terminator to run the interpreter as normal. @@ -866,7 +866,7 @@ TEST_P(ElfInterpreterBadPathTest, Test) { EXPECT_EQ(execve_errno, expected_errno); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Cases, ElfInterpreterBadPathTest, ::testing::ValuesIn({ // NUL-terminated fake path in the PT_INTERP segment. diff --git a/test/syscalls/linux/futex.cc b/test/syscalls/linux/futex.cc index 35933b660..c7a709a0a 100644 --- a/test/syscalls/linux/futex.cc +++ b/test/syscalls/linux/futex.cc @@ -503,8 +503,8 @@ TEST_P(PrivateAndSharedFutexTest, WakeWrongKind_NoRandomSave) { EXPECT_THAT(futex_wake(!IsPrivate(), &a, 1), SyscallSucceedsWithValue(0)); } -INSTANTIATE_TEST_CASE_P(SharedPrivate, PrivateAndSharedFutexTest, - ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(SharedPrivate, PrivateAndSharedFutexTest, + ::testing::Bool()); // Passing null as the address only works for private futexes. diff --git a/test/syscalls/linux/getdents.cc b/test/syscalls/linux/getdents.cc index 526925599..e8a7bcd43 100644 --- a/test/syscalls/linux/getdents.cc +++ b/test/syscalls/linux/getdents.cc @@ -224,8 +224,8 @@ class GetdentsTest : public ::testing::Test { FileDescriptor fd_; }; -// GUnit TYPED_TEST_CASE does not allow multiple template parameters, so we -// must use explicit template specialization to set the syscall number. +// Multiple template parameters are not allowed, so we must use explicit +// template specialization to set the syscall number. template <> int GetdentsTest::SyscallNum() { return SYS_getdents; @@ -239,7 +239,7 @@ int GetdentsTest::SyscallNum() { // Test both legacy getdents and getdents64. typedef ::testing::Types GetdentsTypes; -TYPED_TEST_CASE(GetdentsTest, GetdentsTypes); +TYPED_TEST_SUITE(GetdentsTest, GetdentsTypes); // N.B. TYPED_TESTs require explicitly using this-> to access members of // GetdentsTest, since we are inside of a derived class template. diff --git a/test/syscalls/linux/ioctl.cc b/test/syscalls/linux/ioctl.cc index bee0ba1b3..de29047e0 100644 --- a/test/syscalls/linux/ioctl.cc +++ b/test/syscalls/linux/ioctl.cc @@ -348,8 +348,8 @@ std::vector IoctlSocketTypes() { SimpleSocket(AF_INET6, SOCK_DGRAM, 0)}; } -INSTANTIATE_TEST_CASE_P(IoctlTest, IoctlTestSIOCGIFCONF, - ::testing::ValuesIn(IoctlSocketTypes())); +INSTANTIATE_TEST_SUITE_P(IoctlTest, IoctlTestSIOCGIFCONF, + ::testing::ValuesIn(IoctlSocketTypes())); } // namespace diff --git a/test/syscalls/linux/mremap.cc b/test/syscalls/linux/mremap.cc index ededab336..01116c1ab 100644 --- a/test/syscalls/linux/mremap.cc +++ b/test/syscalls/linux/mremap.cc @@ -377,8 +377,8 @@ TEST_P(MremapParamTest, Fixed_Expansion) { EXPECT_THAT(InForkedProcess(rest), IsPosixErrorOkAndHolds(0)); } -INSTANTIATE_TEST_CASE_P(PrivateShared, MremapParamTest, - ::testing::Values(MAP_PRIVATE, MAP_SHARED)); +INSTANTIATE_TEST_SUITE_P(PrivateShared, MremapParamTest, + ::testing::Values(MAP_PRIVATE, MAP_SHARED)); // mremap with old_size == 0 only works with MAP_SHARED after Linux 4.14 // (dba58d3b8c50 "mm/mremap: fail map duplication attempts for private diff --git a/test/syscalls/linux/msync.cc b/test/syscalls/linux/msync.cc index 72d90dc78..5afbfce72 100644 --- a/test/syscalls/linux/msync.cc +++ b/test/syscalls/linux/msync.cc @@ -93,9 +93,9 @@ TEST_P(MsyncNoMappingTest, UnmappedAddressWithNonzeroLengthFails) { SyscallFailsWithErrno(ENOMEM)); } -INSTANTIATE_TEST_CASE_P(All, MsyncNoMappingTest, - ::testing::Combine(::testing::ValuesIn(kMsyncFlags), - ::testing::Values(NoMappings))); +INSTANTIATE_TEST_SUITE_P(All, MsyncNoMappingTest, + ::testing::Combine(::testing::ValuesIn(kMsyncFlags), + ::testing::Values(NoMappings))); // "Fixture" for msync tests that are not parameterized by msync flags, but do // create mappings. @@ -107,7 +107,7 @@ TEST_P(MsyncNoFlagsTest, BothSyncAndAsyncFails) { SyscallFailsWithErrno(EINVAL)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( All, MsyncNoFlagsTest, ::testing::Combine(::testing::Values(0), // ignored ::testing::ValuesIn(SyncableMappings()))); @@ -142,7 +142,7 @@ TEST_P(MsyncFullParamTest, InvalidateUnlockedSucceeds) { // The test for MS_INVALIDATE on mlocked pages is in mlock.cc since it requires // probing for mlock support. -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( All, MsyncFullParamTest, ::testing::Combine(::testing::ValuesIn(kMsyncFlags), ::testing::ValuesIn(SyncableMappings()))); diff --git a/test/syscalls/linux/proc.cc b/test/syscalls/linux/proc.cc index a55ecaef1..3ec31ae8b 100644 --- a/test/syscalls/linux/proc.cc +++ b/test/syscalls/linux/proc.cc @@ -904,8 +904,8 @@ TEST_P(ProcPidStatTest, HasBasicFields) { EXPECT_GT(rsslim, 0); } -INSTANTIATE_TEST_CASE_P(SelfAndNumericPid, ProcPidStatTest, - ::testing::Values("self", absl::StrCat(getpid()))); +INSTANTIATE_TEST_SUITE_P(SelfAndNumericPid, ProcPidStatTest, + ::testing::Values("self", absl::StrCat(getpid()))); using ProcPidStatmTest = ::testing::TestWithParam; @@ -925,8 +925,8 @@ TEST_P(ProcPidStatmTest, HasBasicFields) { EXPECT_GT(rss, 0); } -INSTANTIATE_TEST_CASE_P(SelfAndNumericPid, ProcPidStatmTest, - ::testing::Values("self", absl::StrCat(getpid()))); +INSTANTIATE_TEST_SUITE_P(SelfAndNumericPid, ProcPidStatmTest, + ::testing::Values("self", absl::StrCat(getpid()))); PosixErrorOr CurrentRSS() { ASSIGN_OR_RETURN_ERRNO(auto proc_self_stat, GetContents("/proc/self/stat")); diff --git a/test/syscalls/linux/proc_pid_uid_gid_map.cc b/test/syscalls/linux/proc_pid_uid_gid_map.cc index e782f2318..96c58c564 100644 --- a/test/syscalls/linux/proc_pid_uid_gid_map.cc +++ b/test/syscalls/linux/proc_pid_uid_gid_map.cc @@ -253,9 +253,9 @@ TEST_P(ProcSelfUidGidMapTest, MapOtherID) { IsPosixErrorOkAndHolds(0)); } -INSTANTIATE_TEST_CASE_P(All, ProcSelfUidGidMapTest, - ::testing::ValuesIn(UidGidMapTestParams()), - DescribeTestParam); +INSTANTIATE_TEST_SUITE_P(All, ProcSelfUidGidMapTest, + ::testing::ValuesIn(UidGidMapTestParams()), + DescribeTestParam); TEST_P(ProcPidUidGidMapTest, MapOtherIDPrivileged) { // Like ProcSelfUidGidMapTest_MapOtherID, but since we have CAP_SET*ID in the @@ -302,9 +302,9 @@ TEST_P(ProcPidUidGidMapTest, MapAnyIDsPrivileged) { SyscallSucceedsWithValue(sizeof(entries))); } -INSTANTIATE_TEST_CASE_P(All, ProcPidUidGidMapTest, - ::testing::ValuesIn(UidGidMapTestParams()), - DescribeTestParam); +INSTANTIATE_TEST_SUITE_P(All, ProcPidUidGidMapTest, + ::testing::ValuesIn(UidGidMapTestParams()), + DescribeTestParam); } // namespace testing } // namespace gvisor diff --git a/test/syscalls/linux/ptrace.cc b/test/syscalls/linux/ptrace.cc index 7927b1697..1c9d7d4f4 100644 --- a/test/syscalls/linux/ptrace.cc +++ b/test/syscalls/linux/ptrace.cc @@ -625,7 +625,7 @@ TEST_P(PtraceExecveTest, Execve_GetRegs_PeekUser_SIGKILL_TraceClone_TraceExit) { _exit(1); } -INSTANTIATE_TEST_CASE_P(TraceExec, PtraceExecveTest, ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(TraceExec, PtraceExecveTest, ::testing::Bool()); // This test has expectations on when syscall-enter/exit-stops occur that are // violated if saving occurs, since saving interrupts all syscalls, causing diff --git a/test/syscalls/linux/socket_abstract.cc b/test/syscalls/linux/socket_abstract.cc index 3c5859302..639cd4e59 100644 --- a/test/syscalls/linux/socket_abstract.cc +++ b/test/syscalls/linux/socket_abstract.cc @@ -30,11 +30,11 @@ std::vector GetSocketPairs() { List{0, SOCK_NONBLOCK})); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, AllSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnixSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_filesystem.cc b/test/syscalls/linux/socket_filesystem.cc index 65128dc01..2653be158 100644 --- a/test/syscalls/linux/socket_filesystem.cc +++ b/test/syscalls/linux/socket_filesystem.cc @@ -30,11 +30,11 @@ std::vector GetSocketPairs() { List{0, SOCK_NONBLOCK})); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, AllSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnixSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_inet_loopback.cc b/test/syscalls/linux/socket_inet_loopback.cc index a079b85dd..cdc5c0ce8 100644 --- a/test/syscalls/linux/socket_inet_loopback.cc +++ b/test/syscalls/linux/socket_inet_loopback.cc @@ -144,7 +144,7 @@ TEST_P(SocketInetLoopbackTest, TCP) { ASSERT_THAT(shutdown(conn_fd.get(), SHUT_RDWR), SyscallSucceeds()); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( All, SocketInetLoopbackTest, ::testing::Values( // Listeners bound to IPv4 addresses refuse connections using IPv6 @@ -394,7 +394,7 @@ TEST_P(SocketInetReusePortTest, UdpPortReuseMultiThread) { EquivalentWithin((kConnectAttempts / kThreadCount), 0.10)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( All, SocketInetReusePortTest, ::testing::Values( // Listeners bound to IPv4 addresses refuse connections using IPv6 @@ -1040,10 +1040,11 @@ TEST_P(SocketMultiProtocolInetLoopbackTest, PortReuseTwoSockets) { } } -INSTANTIATE_TEST_CASE_P(AllFamlies, SocketMultiProtocolInetLoopbackTest, - ::testing::Values(ProtocolTestParam{"TCP", SOCK_STREAM}, - ProtocolTestParam{"UDP", SOCK_DGRAM}), - DescribeProtocolTestParam); +INSTANTIATE_TEST_SUITE_P( + AllFamlies, SocketMultiProtocolInetLoopbackTest, + ::testing::Values(ProtocolTestParam{"TCP", SOCK_STREAM}, + ProtocolTestParam{"UDP", SOCK_DGRAM}), + DescribeProtocolTestParam); } // namespace diff --git a/test/syscalls/linux/socket_ip_loopback_blocking.cc b/test/syscalls/linux/socket_ip_loopback_blocking.cc index b85d5448f..9cec7a71d 100644 --- a/test/syscalls/linux/socket_ip_loopback_blocking.cc +++ b/test/syscalls/linux/socket_ip_loopback_blocking.cc @@ -38,7 +38,7 @@ std::vector GetSocketPairs() { })); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, BlockingSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_ip_tcp_generic_loopback.cc b/test/syscalls/linux/socket_ip_tcp_generic_loopback.cc index dc9a8c8d3..1963d5deb 100644 --- a/test/syscalls/linux/socket_ip_tcp_generic_loopback.cc +++ b/test/syscalls/linux/socket_ip_tcp_generic_loopback.cc @@ -34,7 +34,7 @@ std::vector GetSocketPairs() { }); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, TCPSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_ip_tcp_loopback.cc b/test/syscalls/linux/socket_ip_tcp_loopback.cc index 3ea9c2d1e..7e36c35d2 100644 --- a/test/syscalls/linux/socket_ip_tcp_loopback.cc +++ b/test/syscalls/linux/socket_ip_tcp_loopback.cc @@ -30,7 +30,7 @@ std::vector GetSocketPairs() { }; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, AllSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_ip_tcp_loopback_blocking.cc b/test/syscalls/linux/socket_ip_tcp_loopback_blocking.cc index 57c6953e4..9e2a18d3e 100644 --- a/test/syscalls/linux/socket_ip_tcp_loopback_blocking.cc +++ b/test/syscalls/linux/socket_ip_tcp_loopback_blocking.cc @@ -34,7 +34,7 @@ std::vector GetSocketPairs() { }); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, BlockingStreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_ip_tcp_loopback_nonblock.cc b/test/syscalls/linux/socket_ip_tcp_loopback_nonblock.cc index 7aebab9ae..54053360f 100644 --- a/test/syscalls/linux/socket_ip_tcp_loopback_nonblock.cc +++ b/test/syscalls/linux/socket_ip_tcp_loopback_nonblock.cc @@ -33,7 +33,7 @@ std::vector GetSocketPairs() { }); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, NonBlockingSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_ip_tcp_udp_generic.cc b/test/syscalls/linux/socket_ip_tcp_udp_generic.cc index 525344fbc..5bf1de7c6 100644 --- a/test/syscalls/linux/socket_ip_tcp_udp_generic.cc +++ b/test/syscalls/linux/socket_ip_tcp_udp_generic.cc @@ -68,7 +68,7 @@ std::vector GetSocketPairs() { AllBitwiseCombinations(List{0, SOCK_NONBLOCK}))); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllTCPSockets, TcpUdpSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_ip_udp_loopback.cc b/test/syscalls/linux/socket_ip_udp_loopback.cc index 63b103b8b..0e4463649 100644 --- a/test/syscalls/linux/socket_ip_udp_loopback.cc +++ b/test/syscalls/linux/socket_ip_udp_loopback.cc @@ -32,15 +32,15 @@ std::vector GetSocketPairs() { }; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, AllSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, NonStreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( UDPSockets, UDPSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_ip_udp_loopback_blocking.cc b/test/syscalls/linux/socket_ip_udp_loopback_blocking.cc index 1224ffe03..0c3b669bf 100644 --- a/test/syscalls/linux/socket_ip_udp_loopback_blocking.cc +++ b/test/syscalls/linux/socket_ip_udp_loopback_blocking.cc @@ -29,7 +29,7 @@ std::vector GetSocketPairs() { }; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, BlockingNonStreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_ip_udp_loopback_nonblock.cc b/test/syscalls/linux/socket_ip_udp_loopback_nonblock.cc index 683cf4a6e..7bf8597fe 100644 --- a/test/syscalls/linux/socket_ip_udp_loopback_nonblock.cc +++ b/test/syscalls/linux/socket_ip_udp_loopback_nonblock.cc @@ -29,7 +29,7 @@ std::vector GetSocketPairs() { }; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, NonBlockingSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_ipv4_tcp_unbound_external_networking_test.cc b/test/syscalls/linux/socket_ipv4_tcp_unbound_external_networking_test.cc index c6fb42641..773d84b13 100644 --- a/test/syscalls/linux/socket_ipv4_tcp_unbound_external_networking_test.cc +++ b/test/syscalls/linux/socket_ipv4_tcp_unbound_external_networking_test.cc @@ -28,8 +28,8 @@ std::vector GetSockets() { AllBitwiseCombinations(List{0, SOCK_NONBLOCK})); } -INSTANTIATE_TEST_CASE_P(IPv4TCPSockets, - IPv4TCPUnboundExternalNetworkingSocketTest, - ::testing::ValuesIn(GetSockets())); +INSTANTIATE_TEST_SUITE_P(IPv4TCPSockets, + IPv4TCPUnboundExternalNetworkingSocketTest, + ::testing::ValuesIn(GetSockets())); } // namespace testing } // namespace gvisor diff --git a/test/syscalls/linux/socket_ipv4_udp_unbound_external_networking_test.cc b/test/syscalls/linux/socket_ipv4_udp_unbound_external_networking_test.cc index e07385134..535a5fa10 100644 --- a/test/syscalls/linux/socket_ipv4_udp_unbound_external_networking_test.cc +++ b/test/syscalls/linux/socket_ipv4_udp_unbound_external_networking_test.cc @@ -28,8 +28,8 @@ std::vector GetSockets() { AllBitwiseCombinations(List{0, SOCK_NONBLOCK})); } -INSTANTIATE_TEST_CASE_P(IPv4UDPSockets, - IPv4UDPUnboundExternalNetworkingSocketTest, - ::testing::ValuesIn(GetSockets())); +INSTANTIATE_TEST_SUITE_P(IPv4UDPSockets, + IPv4UDPUnboundExternalNetworkingSocketTest, + ::testing::ValuesIn(GetSockets())); } // namespace testing } // namespace gvisor diff --git a/test/syscalls/linux/socket_ipv4_udp_unbound_loopback.cc b/test/syscalls/linux/socket_ipv4_udp_unbound_loopback.cc index b70faa33d..d6a8e428c 100644 --- a/test/syscalls/linux/socket_ipv4_udp_unbound_loopback.cc +++ b/test/syscalls/linux/socket_ipv4_udp_unbound_loopback.cc @@ -28,8 +28,8 @@ std::vector GetSocketPairs() { AllBitwiseCombinations(List{0, SOCK_NONBLOCK})); } -INSTANTIATE_TEST_CASE_P(IPv4UDPSockets, IPv4UDPUnboundSocketPairTest, - ::testing::ValuesIn(GetSocketPairs())); +INSTANTIATE_TEST_SUITE_P(IPv4UDPSockets, IPv4UDPUnboundSocketPairTest, + ::testing::ValuesIn(GetSocketPairs())); } // namespace testing } // namespace gvisor diff --git a/test/syscalls/linux/socket_netlink_route.cc b/test/syscalls/linux/socket_netlink_route.cc index 50943d384..8d2e7d333 100644 --- a/test/syscalls/linux/socket_netlink_route.cc +++ b/test/syscalls/linux/socket_netlink_route.cc @@ -160,8 +160,8 @@ TEST_P(IntSockOptTest, GetSockOpt) { EXPECT_GT(res, 0); } -INSTANTIATE_TEST_CASE_P(NetlinkRouteTest, IntSockOptTest, - ::testing::Values(SO_SNDBUF, SO_RCVBUF)); +INSTANTIATE_TEST_SUITE_P(NetlinkRouteTest, IntSockOptTest, + ::testing::Values(SO_SNDBUF, SO_RCVBUF)); // Validates the reponses to RTM_GETLINK + NLM_F_DUMP. void CheckGetLinkResponse(const struct nlmsghdr* hdr, int seq, int port) { diff --git a/test/syscalls/linux/socket_unix_abstract.cc b/test/syscalls/linux/socket_unix_abstract.cc index b5d23fd47..c4a3c889c 100644 --- a/test/syscalls/linux/socket_unix_abstract.cc +++ b/test/syscalls/linux/socket_unix_abstract.cc @@ -29,7 +29,7 @@ std::vector GetSocketPairs() { List{0, SOCK_NONBLOCK})); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnixSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_abstract_nonblock.cc b/test/syscalls/linux/socket_unix_abstract_nonblock.cc index 5b514d893..a69ee027e 100644 --- a/test/syscalls/linux/socket_unix_abstract_nonblock.cc +++ b/test/syscalls/linux/socket_unix_abstract_nonblock.cc @@ -29,7 +29,7 @@ std::vector GetSocketPairs() { List{SOCK_NONBLOCK})); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, NonBlockingSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_blocking_local.cc b/test/syscalls/linux/socket_unix_blocking_local.cc index ce9c48ebb..57af118c5 100644 --- a/test/syscalls/linux/socket_unix_blocking_local.cc +++ b/test/syscalls/linux/socket_unix_blocking_local.cc @@ -36,7 +36,7 @@ std::vector GetSocketPairs() { std::vector{SOCK_STREAM, SOCK_SEQPACKET, SOCK_DGRAM})); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, BlockingSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_dgram_local.cc b/test/syscalls/linux/socket_unix_dgram_local.cc index 0c761021c..da8f59704 100644 --- a/test/syscalls/linux/socket_unix_dgram_local.cc +++ b/test/syscalls/linux/socket_unix_dgram_local.cc @@ -40,15 +40,15 @@ std::vector GetSocketPairs() { List{0, SOCK_NONBLOCK})))); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, DgramUnixSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnixNonStreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, NonStreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_dgram_non_blocking.cc b/test/syscalls/linux/socket_unix_dgram_non_blocking.cc index bec0f9cfa..460eb8320 100644 --- a/test/syscalls/linux/socket_unix_dgram_non_blocking.cc +++ b/test/syscalls/linux/socket_unix_dgram_non_blocking.cc @@ -43,7 +43,7 @@ TEST_P(NonBlockingDgramUnixSocketPairTest, ReadOneSideClosed) { SyscallFailsWithErrno(EAGAIN)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, NonBlockingDgramUnixSocketPairTest, ::testing::ValuesIn(IncludeReversals(std::vector{ UnixDomainSocketPair(SOCK_DGRAM | SOCK_NONBLOCK), diff --git a/test/syscalls/linux/socket_unix_domain.cc b/test/syscalls/linux/socket_unix_domain.cc index 5c9be7b1c..f081c601f 100644 --- a/test/syscalls/linux/socket_unix_domain.cc +++ b/test/syscalls/linux/socket_unix_domain.cc @@ -29,7 +29,7 @@ std::vector GetSocketPairs() { List{0, SOCK_NONBLOCK})); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, AllSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_filesystem.cc b/test/syscalls/linux/socket_unix_filesystem.cc index 6d7a0b659..6a67da75f 100644 --- a/test/syscalls/linux/socket_unix_filesystem.cc +++ b/test/syscalls/linux/socket_unix_filesystem.cc @@ -29,7 +29,7 @@ std::vector GetSocketPairs() { List{0, SOCK_NONBLOCK})); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnixSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_filesystem_nonblock.cc b/test/syscalls/linux/socket_unix_filesystem_nonblock.cc index 84914e129..c13a1e564 100644 --- a/test/syscalls/linux/socket_unix_filesystem_nonblock.cc +++ b/test/syscalls/linux/socket_unix_filesystem_nonblock.cc @@ -29,7 +29,7 @@ std::vector GetSocketPairs() { List{SOCK_NONBLOCK})); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, NonBlockingSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_non_stream_blocking_local.cc b/test/syscalls/linux/socket_unix_non_stream_blocking_local.cc index 7c6af99b5..6c435669b 100644 --- a/test/syscalls/linux/socket_unix_non_stream_blocking_local.cc +++ b/test/syscalls/linux/socket_unix_non_stream_blocking_local.cc @@ -33,7 +33,7 @@ std::vector GetSocketPairs() { std::vector{SOCK_DGRAM, SOCK_SEQPACKET})); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, BlockingNonStreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_pair.cc b/test/syscalls/linux/socket_unix_pair.cc index 4006094fb..c575fdcb2 100644 --- a/test/syscalls/linux/socket_unix_pair.cc +++ b/test/syscalls/linux/socket_unix_pair.cc @@ -29,7 +29,7 @@ std::vector GetSocketPairs() { List{0, SOCK_NONBLOCK}))); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnixSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_pair_nonblock.cc b/test/syscalls/linux/socket_unix_pair_nonblock.cc index 2e321ffd8..1ae7f9b5e 100644 --- a/test/syscalls/linux/socket_unix_pair_nonblock.cc +++ b/test/syscalls/linux/socket_unix_pair_nonblock.cc @@ -29,7 +29,7 @@ std::vector GetSocketPairs() { List{SOCK_NONBLOCK})); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, NonBlockingSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_seqpacket_local.cc b/test/syscalls/linux/socket_unix_seqpacket_local.cc index d9f7844db..e6484d9b4 100644 --- a/test/syscalls/linux/socket_unix_seqpacket_local.cc +++ b/test/syscalls/linux/socket_unix_seqpacket_local.cc @@ -40,15 +40,15 @@ std::vector GetSocketPairs() { List{0, SOCK_NONBLOCK})))); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, NonStreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, SeqpacketUnixSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnixNonStreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_stream.cc b/test/syscalls/linux/socket_unix_stream.cc index fec18ff07..95f454251 100644 --- a/test/syscalls/linux/socket_unix_stream.cc +++ b/test/syscalls/linux/socket_unix_stream.cc @@ -44,7 +44,7 @@ TEST_P(StreamUnixSocketPairTest, ReadOneSideClosed) { SyscallSucceedsWithValue(0)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, StreamUnixSocketPairTest, ::testing::ValuesIn(IncludeReversals(VecCat( ApplyVec(UnixDomainSocketPair, diff --git a/test/syscalls/linux/socket_unix_stream_blocking_local.cc b/test/syscalls/linux/socket_unix_stream_blocking_local.cc index 18e49487f..ec0fc6955 100644 --- a/test/syscalls/linux/socket_unix_stream_blocking_local.cc +++ b/test/syscalls/linux/socket_unix_stream_blocking_local.cc @@ -31,7 +31,7 @@ std::vector GetSocketPairs() { }; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, BlockingStreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_stream_local.cc b/test/syscalls/linux/socket_unix_stream_local.cc index 5f6c206ca..bf4c5f2eb 100644 --- a/test/syscalls/linux/socket_unix_stream_local.cc +++ b/test/syscalls/linux/socket_unix_stream_local.cc @@ -38,7 +38,7 @@ std::vector GetSocketPairs() { List{0, SOCK_NONBLOCK}))); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, StreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_stream_nonblock_local.cc b/test/syscalls/linux/socket_unix_stream_nonblock_local.cc index 0c6f71b48..df80b105a 100644 --- a/test/syscalls/linux/socket_unix_stream_nonblock_local.cc +++ b/test/syscalls/linux/socket_unix_stream_nonblock_local.cc @@ -30,7 +30,7 @@ std::vector GetSocketPairs() { }; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, NonBlockingStreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(GetSocketPairs()))); diff --git a/test/syscalls/linux/socket_unix_unbound_abstract.cc b/test/syscalls/linux/socket_unix_unbound_abstract.cc index 0e4a5911e..b6fe7a9ce 100644 --- a/test/syscalls/linux/socket_unix_unbound_abstract.cc +++ b/test/syscalls/linux/socket_unix_unbound_abstract.cc @@ -102,7 +102,7 @@ TEST_P(UnboundAbstractUnixSocketPairTest, GetSockNamePartialLength) { EXPECT_EQ(addr_len, sockets->first_addr_size() - 1); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnboundAbstractUnixSocketPairTest, ::testing::ValuesIn(ApplyVec( AbstractUnboundUnixDomainSocketPair, diff --git a/test/syscalls/linux/socket_unix_unbound_dgram.cc b/test/syscalls/linux/socket_unix_unbound_dgram.cc index 155d8974a..1ec11a08d 100644 --- a/test/syscalls/linux/socket_unix_unbound_dgram.cc +++ b/test/syscalls/linux/socket_unix_unbound_dgram.cc @@ -142,7 +142,7 @@ TEST_P(UnboundDgramUnixSocketPairTest, SendtoWithoutConnect) { SyscallSucceedsWithValue(sizeof(data))); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnboundDgramUnixSocketPairTest, ::testing::ValuesIn(VecCat( ApplyVec(FilesystemUnboundUnixDomainSocketPair, diff --git a/test/syscalls/linux/socket_unix_unbound_filesystem.cc b/test/syscalls/linux/socket_unix_unbound_filesystem.cc index 0da66834d..d09142aa6 100644 --- a/test/syscalls/linux/socket_unix_unbound_filesystem.cc +++ b/test/syscalls/linux/socket_unix_unbound_filesystem.cc @@ -70,7 +70,7 @@ TEST_P(UnboundFilesystemUnixSocketPairTest, GetSockNameLength) { strlen(want_addr.sun_path) + 1 + sizeof(want_addr.sun_family)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnboundFilesystemUnixSocketPairTest, ::testing::ValuesIn(ApplyVec( FilesystemUnboundUnixDomainSocketPair, diff --git a/test/syscalls/linux/socket_unix_unbound_seqpacket.cc b/test/syscalls/linux/socket_unix_unbound_seqpacket.cc index 65efde7f9..270d7203f 100644 --- a/test/syscalls/linux/socket_unix_unbound_seqpacket.cc +++ b/test/syscalls/linux/socket_unix_unbound_seqpacket.cc @@ -71,7 +71,7 @@ TEST_P(UnboundUnixSeqpacketSocketPairTest, SendtoWithoutConnectIgnoresAddr) { SyscallFailsWithErrno(ENOTCONN)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnboundUnixSeqpacketSocketPairTest, ::testing::ValuesIn(IncludeReversals(VecCat( ApplyVec( diff --git a/test/syscalls/linux/socket_unix_unbound_stream.cc b/test/syscalls/linux/socket_unix_unbound_stream.cc index 56fe6b969..4db5b4be1 100644 --- a/test/syscalls/linux/socket_unix_unbound_stream.cc +++ b/test/syscalls/linux/socket_unix_unbound_stream.cc @@ -653,7 +653,7 @@ TEST_P(UnixStreamSocketPairTest, CoalescedDifferingCreds) { sizeof(sent_data3))); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnixStreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(VecCat( ApplyVec(UnixDomainSocketPair, @@ -715,7 +715,7 @@ TEST_P(UnboundUnixStreamSocketPairTest, SendtoWithoutConnectIgnoresAddr) { SyscallFailsWithErrno(EOPNOTSUPP)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AllUnixDomainSockets, UnboundUnixStreamSocketPairTest, ::testing::ValuesIn(IncludeReversals(VecCat( ApplyVec(FilesystemUnboundUnixDomainSocketPair, diff --git a/test/syscalls/linux/tcp_socket.cc b/test/syscalls/linux/tcp_socket.cc index 9d8b4ecc7..1057f5892 100644 --- a/test/syscalls/linux/tcp_socket.cc +++ b/test/syscalls/linux/tcp_socket.cc @@ -508,8 +508,8 @@ TEST_P(TcpSocketTest, SetNoDelay) { EXPECT_EQ(get, kSockOptOff); } -INSTANTIATE_TEST_CASE_P(AllInetTests, TcpSocketTest, - ::testing::Values(AF_INET, AF_INET6)); +INSTANTIATE_TEST_SUITE_P(AllInetTests, TcpSocketTest, + ::testing::Values(AF_INET, AF_INET6)); // Fixture for tests parameterized by address family that don't want the fixture // to do things. @@ -751,8 +751,8 @@ TEST_P(SimpleTcpSocketTest, NonBlockingConnectRefused) { EXPECT_THAT(close(s.release()), SyscallSucceeds()); } -INSTANTIATE_TEST_CASE_P(AllInetTests, SimpleTcpSocketTest, - ::testing::Values(AF_INET, AF_INET6)); +INSTANTIATE_TEST_SUITE_P(AllInetTests, SimpleTcpSocketTest, + ::testing::Values(AF_INET, AF_INET6)); } // namespace diff --git a/test/syscalls/linux/udp_bind.cc b/test/syscalls/linux/udp_bind.cc index 419aaac76..902be47d3 100644 --- a/test/syscalls/linux/udp_bind.cc +++ b/test/syscalls/linux/udp_bind.cc @@ -175,7 +175,7 @@ socklen_t Ipv4MappedIpv6Addr(sockaddr_storage* addr, int port = 0) { return sizeof(struct sockaddr_in6); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( UdpBindTest, SendtoTest, ::testing::Values( []() { diff --git a/test/syscalls/linux/udp_socket.cc b/test/syscalls/linux/udp_socket.cc index 38dfd0ad0..f39281d5c 100644 --- a/test/syscalls/linux/udp_socket.cc +++ b/test/syscalls/linux/udp_socket.cc @@ -1019,8 +1019,8 @@ TEST_P(UdpSocketTest, TimestampIoctlPersistence) { ASSERT_EQ(tv.tv_usec, tv2.tv_usec); } -INSTANTIATE_TEST_CASE_P(AllInetTests, UdpSocketTest, - ::testing::Values(AF_INET, AF_INET6)); +INSTANTIATE_TEST_SUITE_P(AllInetTests, UdpSocketTest, + ::testing::Values(AF_INET, AF_INET6)); } // namespace diff --git a/test/syscalls/linux/vdso_clock_gettime.cc b/test/syscalls/linux/vdso_clock_gettime.cc index 59dd78833..0e936594b 100644 --- a/test/syscalls/linux/vdso_clock_gettime.cc +++ b/test/syscalls/linux/vdso_clock_gettime.cc @@ -94,9 +94,9 @@ TEST_P(CorrectVDSOClockTest, IsCorrect) { } } -INSTANTIATE_TEST_CASE_P(ClockGettime, CorrectVDSOClockTest, - ::testing::Values(CLOCK_MONOTONIC, CLOCK_REALTIME), - PrintClockId); +INSTANTIATE_TEST_SUITE_P(ClockGettime, CorrectVDSOClockTest, + ::testing::Values(CLOCK_MONOTONIC, CLOCK_REALTIME), + PrintClockId); } // namespace diff --git a/test/syscalls/linux/wait.cc b/test/syscalls/linux/wait.cc index d1a4237d2..cfab8a976 100644 --- a/test/syscalls/linux/wait.cc +++ b/test/syscalls/linux/wait.cc @@ -309,7 +309,7 @@ TEST_P(WaitAnyChildTest, IgnoredChildRusage) { EXPECT_EQ(before.ru_stime.tv_usec, after.ru_stime.tv_usec); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Waiters, WaitAnyChildTest, ::testing::Values( [](int code, int options) -> PosixErrorOr { @@ -551,7 +551,7 @@ TEST_P(WaitSpecificChildTest, AfterChildExecve) { EXPECT_NO_ERRNO(WaitFor(child, 0)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Waiters, WaitSpecificChildTest, ::testing::Values( [](pid_t pid, int code) -> PosixError { -- cgit v1.2.3