Skip to content

Commit 2cc4a61

Browse files
committed
test: Ignore some items changed in recent Linux versions
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
1 parent 1b201de commit 2cc4a61

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

libc-test/build.rs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3268,6 +3268,17 @@ fn test_linux(target: &str) {
32683268
| "RTNLGRP_STATS" // linux v5.18+
32693269
=> true,
32703270

3271+
// FIXME: The below is no longer const in glibc 2.34:
3272+
// https://github.com/bminor/glibc/commit/5d98a7dae955bafa6740c26eaba9c86060ae0344
3273+
| "PTHREAD_STACK_MIN"
3274+
| "SIGSTKSZ"
3275+
| "MINSIGSTKSZ"
3276+
if gnu => true,
3277+
3278+
// FIXME: Linux >= 5.16 changed its value:
3279+
// https://github.com/torvalds/linux/commit/42df6e1d221dddc0f2acf2be37e68d553ad65f96
3280+
"NF_NETDEV_NUMHOOKS" => true,
3281+
32713282
_ => false,
32723283
}
32733284
});
@@ -3424,7 +3435,10 @@ fn test_linux(target: &str) {
34243435
// the `u` field is in fact an anonymous union
34253436
(gnu && struct_ == "ptrace_syscall_info" && (field == "u" || field == "pad")) ||
34263437
// the vregs field is a `__uint128_t` C's type.
3427-
(struct_ == "user_fpsimd_struct" && field == "vregs")
3438+
(struct_ == "user_fpsimd_struct" && field == "vregs") ||
3439+
// Linux >= 5.11 tweaked the `svm_zero` field of the `sockaddr_vm` struct.
3440+
// https://github.com/torvalds/linux/commit/dc8eeef73b63ed8988224ba6b5ed19a615163a7f
3441+
(struct_ == "sockaddr_vm" && field == "svm_zero")
34283442
});
34293443

34303444
cfg.skip_roundtrip(move |s| match s {

0 commit comments

Comments
 (0)