Skip to content

Commit ea09f0d

Browse files
committed
FreeBSD: libc-test: make the skip_fn section less messy
1 parent a4fd9d3 commit ea09f0d

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

libc-test/build.rs

+16-19
Original file line numberDiff line numberDiff line change
@@ -2311,9 +2311,6 @@ fn test_freebsd(target: &str) {
23112311
// FIXME: https://github.com/rust-lang/libc/issues/1272
23122312
"execv" | "execve" | "execvp" | "execvpe" | "fexecve" => true,
23132313

2314-
// `fspacectl` was introduced in FreeBSD 14
2315-
"fspacectl" if Some(14) > freebsd_ver => true,
2316-
23172314
// The `uname` function in the `utsname.h` FreeBSD header is a C
23182315
// inline function (has no symbol) that calls the `__xuname` symbol.
23192316
// Therefore the function pointer comparison does not make sense for it.
@@ -2325,37 +2322,37 @@ fn test_freebsd(target: &str) {
23252322
// https://github.com/gnzlbg/ctest/issues/68
23262323
"lio_listio" => true,
23272324

2328-
// Those introduced in FreeBSD 12.
2325+
// Those are introduced in FreeBSD 12.
23292326
"clock_nanosleep" | "getrandom" | "elf_aux_info" | "setproctitle_fast"
23302327
| "timingsafe_bcmp" | "timingsafe_memcmp"
23312328
if Some(12) > freebsd_ver =>
23322329
{
23332330
true
23342331
}
23352332

2336-
// Those are introduced in FreeBSD 14.
2337-
"sched_getaffinity" | "sched_setaffinity" | "sched_getcpu"
2338-
if Some(14) > freebsd_ver =>
2333+
// Those are introduced in FreeBSD 13.
2334+
"memfd_create"
2335+
| "shm_create_largepage"
2336+
| "shm_rename"
2337+
| "getentropy"
2338+
| "eventfd"
2339+
| "SOCKCRED2SIZE"
2340+
| "getlocalbase"
2341+
| "aio_readv"
2342+
| "aio_writev"
2343+
| "copy_file_range"
2344+
if Some(13) > freebsd_ver =>
23392345
{
23402346
true
23412347
}
23422348

2343-
// This is not available in FreeBSD 12.
2344-
"SOCKCRED2SIZE" if Some(13) > freebsd_ver => true,
2345-
2346-
// Those are not available in FreeBSD 12.
2347-
"memfd_create" | "shm_create_largepage" | "shm_rename" | "getentropy" | "eventfd"
2348-
if Some(13) > freebsd_ver =>
2349+
// Those are introduced in FreeBSD 14.
2350+
"sched_getaffinity" | "sched_setaffinity" | "sched_getcpu" | "fspacectl"
2351+
if Some(14) > freebsd_ver =>
23492352
{
23502353
true
23512354
}
23522355

2353-
// Added in FreeBSD 13.
2354-
"getlocalbase" if Some(13) > freebsd_ver => true,
2355-
"aio_readv" if Some(13) > freebsd_ver => true,
2356-
"aio_writev" if Some(13) > freebsd_ver => true,
2357-
"copy_file_range" if Some(13) > freebsd_ver => true,
2358-
23592356
_ => false,
23602357
}
23612358
});

0 commit comments

Comments
 (0)