From nobody Thu Aug 10 14:52:14 2023 X-Original-To: dev-commits-src-all@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 4RM8z53Wctz4mN8V; Thu, 10 Aug 2023 14:52:17 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RM8z516Y2z3cLr; Thu, 10 Aug 2023 14:52:17 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id U1zeqst256NwhU71MqH7b3; Thu, 10 Aug 2023 14:52:16 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPA id U71Kqhk6B3fOSU71LqpJEs; Thu, 10 Aug 2023 14:52:16 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=64d4f9a0 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=UttIx32zK-AA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=SsIBFIezZzvieMDQM80A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 88F3C9C9; Thu, 10 Aug 2023 07:52:14 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 7FD4A197; Thu, 10 Aug 2023 07:52:14 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Enji Cooper cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 811e0a31acaf - main - fusefs tests: handle -Wdeprecated* issues with GoogleTest 1.14.0 In-reply-to: <202308100232.37A2WgNG040490@gitrepo.freebsd.org> References: <202308100232.37A2WgNG040490@gitrepo.freebsd.org> Comments: In-reply-to Enji Cooper message dated "Thu, 10 Aug 2023 02:32:42 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 10 Aug 2023 07:52:14 -0700 Message-Id: <20230810145214.7FD4A197@slippy.cwsent.com> X-CMAE-Envelope: MS4xfJthVj21vbpooKboUlOWLWGOWmisF8ickQ5L/Qh6Pgc9a9a2nXoDspQg1y+Elcs7tHinz2lfuefmEuvk2h9zHvp79p4nrTGYXr2/nRl+myvJC0pKBvp9 5oq/RYhtJm8vzHVngfN/lDgmW31tvH82x5/bz86hbqAtQ3IdeJB0f5rUgyHFaflw0EG+XbAb/0GczHm1fNE8/phyzruQJ99sF9ri1Np3XBS5EUcuoi+UyxUs 5K6Mj9eSwtX7Aay5O4mO881HZP7yDlrTa0chi13ATpF1ldQ2lRYFzhag43pQ782q7HHOjwGTgT1sNrC0fbAWAr6+m1+x3eADjOFT7D2ZYZY= X-Rspamd-Queue-Id: 4RM8z516Y2z3cLr X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message <202308100232.37A2WgNG040490@gitrepo.freebsd.org>, Enji Cooper write s: > The branch main has been updated by ngie: > > URL: https://cgit.FreeBSD.org/src/commit/?id=811e0a31acafd6ab21f89bec8ba0fb8c > 09f258d2 > > commit 811e0a31acafd6ab21f89bec8ba0fb8c09f258d2 > Author: Enji Cooper > AuthorDate: 2023-08-08 13:42:07 +0000 > Commit: Enji Cooper > CommitDate: 2023-08-10 09:32:33 +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. > > MFC after: 2 weeks > Reviewed by: asomers > Differential Revision: https://reviews.freebsd.org/D41398 > --- > 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/fallocate.cc | 4 ++-- > tests/sys/fs/fusefs/io.cc | 4 ++-- > 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 +++--- > 9 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/tests/sys/fs/fusefs/bmap.cc b/tests/sys/fs/fusefs/bmap.cc > index 9d97d1c08ca5..3191ac657de9 100644 > --- a/tests/sys/fs/fusefs/bmap.cc > +++ b/tests/sys/fs/fusefs/bmap.cc > @@ -253,6 +253,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 cf9476a0a853..429b54c7ba75 100644 > --- a/tests/sys/fs/fusefs/cache.cc > +++ b/tests/sys/fs/fusefs/cache.cc > @@ -197,7 +197,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_f > use_poll.cc > index de1b9a6b5f3f..4777f9818c60 100644 > --- a/tests/sys/fs/fusefs/dev_fuse_poll.cc > +++ b/tests/sys/fs/fusefs/dev_fuse_poll.cc > @@ -98,7 +98,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/fallocate.cc b/tests/sys/fs/fusefs/fallocate > .cc > index d10abfba3807..166f9ca7ff3a 100644 > --- a/tests/sys/fs/fusefs/fallocate.cc > +++ b/tests/sys/fs/fusefs/fallocate.cc > @@ -493,8 +493,8 @@ TEST_P(FspacectlCache, clears_cache) > leak(fd); > } > > -INSTANTIATE_TEST_CASE_P(FspacectlCache, FspacectlCache, > - Values(Uncached, Writethrough, Writeback), > +INSTANTIATE_TEST_SUITE_P(FspacectlCache, FspacectlCache, > + Values(Uncached, Writethrough, Writeback) > ); > > /* > diff --git a/tests/sys/fs/fusefs/io.cc b/tests/sys/fs/fusefs/io.cc > index d08dea99ff47..fe3237d39c95 100644 > --- a/tests/sys/fs/fusefs/io.cc > +++ b/tests/sys/fs/fusefs/io.cc > @@ -509,14 +509,14 @@ TEST_P(Io, resize_a_valid_buffer_while_extending) > close(m_test_fd); > } > > -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) > ) > ); > > -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) > diff --git a/tests/sys/fs/fusefs/last_local_modify.cc b/tests/sys/fs/fusefs/l > ast_local_modify.cc > index dd0d9c740355..537187a6bfb7 100644 > --- a/tests/sys/fs/fusefs/last_local_modify.cc > +++ b/tests/sys/fs/fusefs/last_local_modify.cc > @@ -506,7 +506,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 06ebe7fedebc..db06068e4eb8 100644 > --- a/tests/sys/fs/fusefs/mount.cc > +++ b/tests/sys/fs/fusefs/mount.cc > @@ -192,11 +192,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", "MN > T_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 f1f485d0b736..72e09d355ad3 100644 > --- a/tests/sys/fs/fusefs/read.cc > +++ b/tests/sys/fs/fusefs/read.cc > @@ -1314,7 +1314,7 @@ TEST_P(ReadAhead, readahead) { > free(contents); > } > > -INSTANTIATE_TEST_CASE_P(RA, ReadAhead, > +INSTANTIATE_TEST_SUITE_P(RA, ReadAhead, > Values(tuple(false, 0), > tuple(false, 1), > tuple(false, 2), > @@ -1362,4 +1362,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 a217e285a76b..c8cb7d08f474 100644 > --- a/tests/sys/fs/fusefs/write.cc > +++ b/tests/sys/fs/fusefs/write.cc > @@ -616,7 +616,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) > ); > > @@ -724,7 +724,7 @@ TEST_P(WriteEofDuringVnopStrategy, eof_during_vop_strateg > y) > > } > > -INSTANTIATE_TEST_CASE_P(W, WriteEofDuringVnopStrategy, > +INSTANTIATE_TEST_SUITE_P(W, WriteEofDuringVnopStrategy, > Values(1, 2, 3) > ); > > @@ -1546,7 +1546,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 > Probably precipitated by the local revert of 28f6c2f29280 due to its build failure, this causes the following build failure. -- bmap --- /opt/src/git-src/tests/sys/fs/fusefs/bmap.cc:256:26: error: unknown type name 'BE' INSTANTIATE_TEST_SUITE_P(BE, BmapEof, ^ /opt/src/git-src/tests/sys/fs/fusefs/bmap.cc:256:37: error: parameter type 'BmapEof' is an abstract class INSTANTIATE_TEST_SUITE_P(BE, BmapEof, ^ /opt/src/git-src/tests/sys/< µ’)fs/fusefs/bmap.cc:257:2: error: unknown type name 'Values' Values(1, 2, 3) ^ /opt/src/git-src/tests/sys/fs/fusefs/bmap.cc:257:9: error: expected ')' Values(1, 2, 3) ^ /opt/src/git-src/tests/sys/fs/fusefs/bmap.cc:257:8: note: to match this '(' Values(1, 2, 3) ^ /opt/src/git-src/tests/sys/fs/fusefs/bmap.cc:256:1: error: a type specifier is required for all declarations INSTANTIATE_TEST_SUITE_P(BE, BmapEof, ^ -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0