From nobody Wed Mar 26 18:08:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZNFCG6xvHz5sF4c; Wed, 26 Mar 2025 18:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZNFCG5k3Mz3hvt; Wed, 26 Mar 2025 18:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743012506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MOqT/51vfeagMJrBBXCOYykMkQ04ARA1qDhhjWlS8dM=; b=VsIXHVQDjNV8AUzANZx3fHJ760bK96Ri+V5Bby0WXffTjUonFdHzmg3kIlip2oM32fgHSJ brCsjK9Ne4RoYSWchtXaFwWg0exMb/afR39vTkXsyqCCJP6BVkPt2ujBdf4Q0Lv98M8eBh zPD9J4kQFIfkUc4yZ1OSxMXkopwk09ZtF5hxKiZkAfKx7CIbCiZuoWyZbFlnZEW45ZRJ8Y JVqwAibY5Ggbe8pWJ9z9ohiEc06tgVf9kAJYTlZn0a1umuMIev935oboQP7S+96Ml33lDb ODA2njJOUnbnC0a0ytFvuXyKCKwaPW5indCTyX4Xy5Tjaw1cGJKxLiKT+YIpnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743012506; a=rsa-sha256; cv=none; b=vDIwYn21rHAv9fwxNnDVuBjEAHvrUqlm7+4YmDhVXspmHyCamLBdwFqr1MLWbOJOeKcVnE zkWOTsL8YjbtZQSIl+X5qmdY+DJoq6qrqkQwhuTTDXGFk8xgJwhdUP+69tZZ/WbiYlgpOK zo+2eWbtBXxivOUWMhX6YvHP1hLFoMHxAbpOGSRxHm/p94swGsXB23z3qWVGGLWyEQ1Ltl hiiHtrKlhTkw1dDbnvfIb3smkcKBsS4KW3XbS9CS6KV+pJujyFUk96sLA01/r1XB3RlLLS ekuDKKDxBDYpLL56U62uCQfAhjlh4YiQyQyGv/hcioF173mAcgVF+8MEsRJvdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743012506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MOqT/51vfeagMJrBBXCOYykMkQ04ARA1qDhhjWlS8dM=; b=gyuhyXhUecpUl2kIVqhsK1vVTFkQB42f/JMtY6HJHS++JkVZTleKhCK2alvw0qj06wjY6L g86IMxH82+sV30OeF376i6PttK/6IQ5QJcDPZttM+2vDUdTe+kCcVhJ1ysSNbPV12X+C06 wyJTukrOVgM5wKrlVoUU3TySnZR0ncuy9TElU3iAIrKICEg+OwJnbyTJN5hTAW8KbJvJ9x LJMN29mH+DIjRnNWad63uasYNiKYA66Pwtv0twuOgFREbSwfrnvB8Boaa25rwFlTqQpkmv nGXgd19ZsZwnOQiTa4MCTocZ731Bq87C15aeTtmR1yqDkAbUVHG0GSPJZVLcAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZNFCG4m10z6Cn; Wed, 26 Mar 2025 18:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52QI8QKl016483; Wed, 26 Mar 2025 18:08:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52QI8QnP016480; Wed, 26 Mar 2025 18:08:26 GMT (envelope-from git) Date: Wed, 26 Mar 2025 18:08:26 GMT Message-Id: <202503261808.52QI8QnP016480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 2adc0bae0b46 - stable/13 - fusefs tests: handle -Wdeprecated* issues with GoogleTest 1.14.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2adc0bae0b4613282f2a954089b5bdad487a4c2d Auto-Submitted: auto-generated The branch stable/13 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=2adc0bae0b4613282f2a954089b5bdad487a4c2d commit 2adc0bae0b4613282f2a954089b5bdad487a4c2d Author: Enji Cooper AuthorDate: 2023-08-08 13:42:07 +0000 Commit: Enji Cooper CommitDate: 2025-03-26 16:40:48 +0000 fusefs tests: handle -Wdeprecated* issues with GoogleTest 1.14.0 `INSTANTIATE_TEST_CASE_P` has been replaced with `INSTANTIATE_TEST_SUITE_P`. Replace all uses of the former macro with the latter macro. While here, address the fact that the latter macro doesn't permit some of the constructions that the former macro did, e.g., empty parameters, etc. Conflicts: tests/sys/fs/fusefs/fallocate.cc (fix applied manually) tests/sys/fs/fusefs/io.cc (change reverted) MFC after: 2 weeks Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D41398 (cherry picked from commit 811e0a31acafd6ab21f89bec8ba0fb8c09f258d2) --- tests/sys/fs/fusefs/bmap.cc | 2 +- tests/sys/fs/fusefs/cache.cc | 2 +- tests/sys/fs/fusefs/dev_fuse_poll.cc | 2 +- tests/sys/fs/fusefs/io.cc | 6 +++--- tests/sys/fs/fusefs/last_local_modify.cc | 2 +- tests/sys/fs/fusefs/mount.cc | 6 +++--- tests/sys/fs/fusefs/read.cc | 4 ++-- tests/sys/fs/fusefs/write.cc | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/sys/fs/fusefs/bmap.cc b/tests/sys/fs/fusefs/bmap.cc index 8e9268058e96..30612079657d 100644 --- a/tests/sys/fs/fusefs/bmap.cc +++ b/tests/sys/fs/fusefs/bmap.cc @@ -261,6 +261,6 @@ TEST_P(BmapEof, eof) leak(fd); } -INSTANTIATE_TEST_CASE_P(BE, BmapEof, +INSTANTIATE_TEST_SUITE_P(BE, BmapEof, Values(1, 2, 3) ); diff --git a/tests/sys/fs/fusefs/cache.cc b/tests/sys/fs/fusefs/cache.cc index 47841d46c90d..ea6d87674da2 100644 --- a/tests/sys/fs/fusefs/cache.cc +++ b/tests/sys/fs/fusefs/cache.cc @@ -195,7 +195,7 @@ TEST_P(Cache, truncate_by_surprise_invalidates_cache) leak(fd); } -INSTANTIATE_TEST_CASE_P(Cache, Cache, +INSTANTIATE_TEST_SUITE_P(Cache, Cache, Combine( /* Test every combination that: * - does not cache at least one of entries and attrs diff --git a/tests/sys/fs/fusefs/dev_fuse_poll.cc b/tests/sys/fs/fusefs/dev_fuse_poll.cc index b26071f828fe..181cd69de665 100644 --- a/tests/sys/fs/fusefs/dev_fuse_poll.cc +++ b/tests/sys/fs/fusefs/dev_fuse_poll.cc @@ -96,7 +96,7 @@ TEST_P(DevFusePoll, destroy) m_mock->unmount(); } -INSTANTIATE_TEST_CASE_P(PM, DevFusePoll, +INSTANTIATE_TEST_SUITE_P(PM, DevFusePoll, ::testing::Values("BLOCKING", "KQ", "POLL", "SELECT")); static void* statter(void* arg) { diff --git a/tests/sys/fs/fusefs/io.cc b/tests/sys/fs/fusefs/io.cc index 84c6e3c0161b..f6c7975ac36e 100644 --- a/tests/sys/fs/fusefs/io.cc +++ b/tests/sys/fs/fusefs/io.cc @@ -583,7 +583,7 @@ TEST_P(IoCopyFileRange, copy_file_range_from_mapped_write) } -INSTANTIATE_TEST_CASE_P(Io, Io, +INSTANTIATE_TEST_SUITE_P(Io, Io, Combine(Bool(), /* async read */ Values(0x1000, 0x10000, 0x20000), /* m_maxwrite */ Values(Uncached, Writethrough, Writeback, WritebackAsync), @@ -591,7 +591,7 @@ INSTANTIATE_TEST_CASE_P(Io, Io, ) ); -INSTANTIATE_TEST_CASE_P(Io, IoCacheable, +INSTANTIATE_TEST_SUITE_P(Io, IoCacheable, Combine(Bool(), /* async read */ Values(0x1000, 0x10000, 0x20000), /* m_maxwrite */ Values(Writethrough, Writeback, WritebackAsync), @@ -599,7 +599,7 @@ INSTANTIATE_TEST_CASE_P(Io, IoCacheable, ) ); -INSTANTIATE_TEST_CASE_P(Io, IoCopyFileRange, +INSTANTIATE_TEST_SUITE_P(Io, IoCopyFileRange, Combine(Bool(), /* async read */ Values(0x10000), /* m_maxwrite */ Values(Writethrough, Writeback, WritebackAsync), diff --git a/tests/sys/fs/fusefs/last_local_modify.cc b/tests/sys/fs/fusefs/last_local_modify.cc index fa0137d77aa7..495bfd8aa959 100644 --- a/tests/sys/fs/fusefs/last_local_modify.cc +++ b/tests/sys/fs/fusefs/last_local_modify.cc @@ -504,7 +504,7 @@ TEST_P(LastLocalModify, vfs_vget) } -INSTANTIATE_TEST_CASE_P(LLM, LastLocalModify, +INSTANTIATE_TEST_SUITE_P(LLM, LastLocalModify, Values( "VOP_ALLOCATE", "VOP_COPY_FILE_RANGE", diff --git a/tests/sys/fs/fusefs/mount.cc b/tests/sys/fs/fusefs/mount.cc index 570d1a8dbc5c..7a8d2c1396f0 100644 --- a/tests/sys/fs/fusefs/mount.cc +++ b/tests/sys/fs/fusefs/mount.cc @@ -190,11 +190,11 @@ TEST_P(UpdateErr, update) EXPECT_TRUE((newflags ^ statbuf.f_flags) & flag); } -INSTANTIATE_TEST_CASE_P(Mount, UpdateOk, +INSTANTIATE_TEST_SUITE_P(Mount, UpdateOk, ::testing::Values("MNT_RDONLY", "MNT_NOEXEC", "MNT_NOSUID", "MNT_NOATIME", "MNT_SUIDDIR") ); -INSTANTIATE_TEST_CASE_P(Mount, UpdateErr, - ::testing::Values( "MNT_USER"); +INSTANTIATE_TEST_SUITE_P(Mount, UpdateErr, + ::testing::Values( "MNT_USER") ); diff --git a/tests/sys/fs/fusefs/read.cc b/tests/sys/fs/fusefs/read.cc index df2ca2380f00..9693428914e6 100644 --- a/tests/sys/fs/fusefs/read.cc +++ b/tests/sys/fs/fusefs/read.cc @@ -1359,7 +1359,7 @@ TEST_P(ReadAhead, readahead) { delete[] contents; } -INSTANTIATE_TEST_CASE_P(RA, ReadAhead, +INSTANTIATE_TEST_SUITE_P(RA, ReadAhead, Values(tuple(false, 0), tuple(false, 1), tuple(false, 2), @@ -1441,4 +1441,4 @@ TEST_P(TimeGran, atime_during_setattr) leak(fd); } -INSTANTIATE_TEST_CASE_P(TG, TimeGran, Range(0u, 10u)); +INSTANTIATE_TEST_SUITE_P(TG, TimeGran, Range(0u, 10u)); diff --git a/tests/sys/fs/fusefs/write.cc b/tests/sys/fs/fusefs/write.cc index 0b93369ad66d..1fe2e3cc522d 100644 --- a/tests/sys/fs/fusefs/write.cc +++ b/tests/sys/fs/fusefs/write.cc @@ -612,7 +612,7 @@ TEST_P(WriteRlimitFsize, rlimit_fsize_truncate) leak(fd); } -INSTANTIATE_TEST_CASE_P(W, WriteRlimitFsize, +INSTANTIATE_TEST_SUITE_P(W, WriteRlimitFsize, Values(0, O_DIRECT) ); @@ -720,7 +720,7 @@ TEST_P(WriteEofDuringVnopStrategy, eof_during_vop_strategy) } -INSTANTIATE_TEST_CASE_P(W, WriteEofDuringVnopStrategy, +INSTANTIATE_TEST_SUITE_P(W, WriteEofDuringVnopStrategy, Values(1, 2, 3) ); @@ -1531,7 +1531,7 @@ TEST_P(TimeGran, timestamps_during_setattr) leak(fd); } -INSTANTIATE_TEST_CASE_P(RA, TimeGran, Range(0u, 10u)); +INSTANTIATE_TEST_SUITE_P(RA, TimeGran, Range(0u, 10u)); /* * Without direct_io, writes should be committed to cache