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
This commit is contained in:
parent
28f6c2f292
commit
811e0a31ac
@ -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)
|
||||
);
|
||||
|
@ -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
|
||||
|
@ -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) {
|
||||
|
@ -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)
|
||||
);
|
||||
|
||||
/*
|
||||
|
@ -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)
|
||||
|
@ -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",
|
||||
|
@ -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", "MNT_NOATIME",
|
||||
"MNT_SUIDDIR")
|
||||
);
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(Mount, UpdateErr,
|
||||
::testing::Values( "MNT_USER");
|
||||
INSTANTIATE_TEST_SUITE_P(Mount, UpdateErr,
|
||||
::testing::Values( "MNT_USER")
|
||||
);
|
||||
|
@ -1314,7 +1314,7 @@ TEST_P(ReadAhead, readahead) {
|
||||
free(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),
|
||||
@ -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));
|
||||
|
@ -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_strategy)
|
||||
|
||||
}
|
||||
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user