Skip to content

Commit c73a50d

Browse files
authored
Fix CI for FreeBSD 15 (#3950)
It was failing for two reasons: * 87fbd9fc7[^1] removed the TCP_MAXPEAKRATE symbol. * 3458bbd39[^2] changed the value of RLIM_NLIMITS Fixes #3947 [^1]: freebsd/freebsd-src@87fbd9f [^2]: freebsd/freebsd-src@3458bbd
1 parent 09d7aa0 commit c73a50d

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

libc-test/build.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2306,6 +2306,10 @@ fn test_freebsd(target: &str) {
23062306
| "PWAIT" | "PLOCK" | "PPAUSE" | "PRI_MIN_TIMESHARE" | "PUSER" | "PI_AV" | "PI_NET"
23072307
| "PI_DISK" | "PI_TTY" | "PI_DULL" | "PI_SOFT" => true,
23082308

2309+
// This constant changed in FreeBSD 15 (git 3458bbd397783). It was never intended to
2310+
// be stable, and probably shouldn't be bound by libc at all.
2311+
"RLIM_NLIMITS" => true,
2312+
23092313
// This symbol changed in FreeBSD 14 (git 051e7d78b03), but the new
23102314
// version should be safe to use on older releases.
23112315
"IFCAP_CANTCHANGE" => true,
@@ -2436,7 +2440,6 @@ fn test_freebsd(target: &str) {
24362440

24372441
// Flags introduced in FreeBSD 14.
24382442
"TCP_MAXUNACKTIME"
2439-
| "TCP_MAXPEAKRATE"
24402443
| "TCP_IDLE_REDUCE"
24412444
| "TCP_REMOTE_UDP_ENCAPS_PORT"
24422445
| "TCP_DELACK"

libc-test/semver/freebsd.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,6 @@ TCP_KEEPIDLE
14941494
TCP_KEEPINIT
14951495
TCP_KEEPINTVL
14961496
TCP_LOG_LIMIT
1497-
TCP_MAXPEAKRATE
14981497
TCP_MAXSEG
14991498
TCP_MAXUNACKTIME
15001499
TCP_MD5SIG

src/unix/bsd/freebsdlike/freebsd/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3779,7 +3779,6 @@ pub const TCP_INFO: ::c_int = 32;
37793779
pub const TCP_CONGESTION: ::c_int = 64;
37803780
pub const TCP_CCALGOOPT: ::c_int = 65;
37813781
pub const TCP_MAXUNACKTIME: ::c_int = 68;
3782-
pub const TCP_MAXPEAKRATE: ::c_int = 69;
37833782
pub const TCP_IDLE_REDUCE: ::c_int = 70;
37843783
pub const TCP_REMOTE_UDP_ENCAPS_PORT: ::c_int = 71;
37853784
pub const TCP_DELACK: ::c_int = 72;

0 commit comments

Comments
 (0)