Skip to content

Commit cf0edd0

Browse files
committed
Auto merge of #26155 - dhuseby:fixing_bitrig_net_tests, r=alexcrichton
… congruent due to rounding errors @semarie this affected both openbsd and bitrig. it seems the correct solution is to switch to fixed point arithmetic in the timeout code, the same as freebsd.
2 parents 37cf025 + 4a2d4d3 commit cf0edd0

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/libstd/net/tcp.rs

+3
Original file line numberDiff line numberDiff line change
@@ -902,6 +902,9 @@ mod tests {
902902
assert_eq!(format!("{:?}", stream), compare);
903903
}
904904

905+
// FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
906+
// no longer has rounding errors.
907+
#[cfg_attr(any(target_os = "bitrig", target_os = "openbsd"), ignore)]
905908
#[test]
906909
fn timeouts() {
907910
let addr = next_test_ip4();

src/libstd/net/udp.rs

+3
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,9 @@ mod tests {
360360
assert_eq!(format!("{:?}", udpsock), compare);
361361
}
362362

363+
// FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
364+
// no longer has rounding errors.
365+
#[cfg_attr(any(target_os = "bitrig", target_os = "openbsd"), ignore)]
363366
#[test]
364367
fn timeouts() {
365368
let addr = next_test_ip4();

0 commit comments

Comments
 (0)