Skip to content

Commit 44b29ed

Browse files
semarietgross35
authored andcommitted
openbsd: ignore some constants in CI (removed in upcoming OpenBSD 7.8)
(backport <rust-lang#4461>) (cherry picked from commit f5220c1)
1 parent f4619be commit 44b29ed

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

libc-test/build.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,12 @@ fn test_openbsd(target: &str) {
622622
"KERN_MAXID" | "NET_RT_MAXID" => true,
623623
"EV_SYSFLAGS" => true,
624624

625-
// Removed in OpenBSD 7.7 (unused since 1991)
625+
// Removed in OpenBSD 7.7
626626
"ATF_COM" | "ATF_PERM" | "ATF_PUBL" | "ATF_USETRAILERS" => true,
627627

628+
// Removed in OpenBSD 7.8
629+
"CTL_FS" | "SO_NETPROC" => true,
630+
628631
_ => false,
629632
}
630633
});
@@ -5622,9 +5625,9 @@ fn test_aix(target: &str) {
56225625
});
56235626

56245627
cfg.type_name(move |ty, is_struct, is_union| match ty {
5625-
"DIR" => ty.to_string(),
5626-
"FILE" => ty.to_string(),
5627-
"ACTION" => ty.to_string(),
5628+
"DIR" => ty.to_string(),
5629+
"FILE" => ty.to_string(),
5630+
"ACTION" => ty.to_string(),
56285631

56295632
// 'sigval' is a struct in Rust, but a union in C.
56305633
"sigval" => format!("union sigval"),
@@ -5711,9 +5714,9 @@ fn test_aix(target: &str) {
57115714
// POSIX-compliant versions in the system libc. As a result,
57125715
// function pointer comparisons between the C and Rust sides
57135716
// would fail.
5714-
"getpwuid_r" | "getpwnam_r" | "getgrgid_r" | "getgrnam_r"
5715-
| "aio_cancel" | "aio_error" | "aio_fsync" | "aio_read"
5716-
| "aio_return" | "aio_suspend" | "aio_write" | "select" => true,
5717+
"getpwuid_r" | "getpwnam_r" | "getgrgid_r" | "getgrnam_r" | "aio_cancel"
5718+
| "aio_error" | "aio_fsync" | "aio_read" | "aio_return" | "aio_suspend"
5719+
| "aio_write" | "select" => true,
57175720

57185721
// 'getdtablesize' is a constant in the AIX header but it is
57195722
// a real function in libc which the Rust side is resolved to.
@@ -5730,7 +5733,6 @@ fn test_aix(target: &str) {
57305733
}
57315734
});
57325735

5733-
57345736
cfg.volatile_item(|i| {
57355737
use ctest::VolatileItemKind::*;
57365738
match i {

0 commit comments

Comments
 (0)