git: 2adc0bae0b46 - stable/13 - fusefs tests: handle -Wdeprecated* issues with GoogleTest 1.14.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 26 Mar 2025 18:08:26 UTC
The branch stable/13 has been updated by ngie:
URL: https://cgit.FreeBSD.org/src/commit/?id=2adc0bae0b4613282f2a954089b5bdad487a4c2d
commit 2adc0bae0b4613282f2a954089b5bdad487a4c2d
Author: Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2023-08-08 13:42:07 +0000
Commit: Enji Cooper <ngie@FreeBSD.org>
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<bool, int>(false, 0),
tuple<bool, int>(false, 1),
tuple<bool, int>(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