7435fefd26
This is an alternative implementation of https://github.com/NixOS/nixpkgs/pull/21741/files
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 0becb0b7cff0176279fc9f94c91299d788a43941 Mon Sep 17 00:00:00 2001
|
|
From: Moritz Ulrich <moritz@tarn-vedra.de>
|
|
Date: Sun, 8 Jan 2017 10:28:17 +0100
|
|
Subject: [PATCH] Disable libstd::net::tcp::{ttl, timeouts} on Darwin
|
|
|
|
---
|
|
src/libstd/net/tcp.rs | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
|
|
index 0e7c5b0671..189c31b958 100644
|
|
--- a/src/libstd/net/tcp.rs
|
|
+++ b/src/libstd/net/tcp.rs
|
|
@@ -1022,7 +1022,10 @@ mod tests {
|
|
|
|
// FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
|
|
// no longer has rounding errors.
|
|
- #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)]
|
|
+ #[cfg_attr(any(target_os = "bitrig",
|
|
+ target_os = "netbsd",
|
|
+ target_os = "openbsd",
|
|
+ target_os = "macos"), ignore)]
|
|
#[test]
|
|
fn timeouts() {
|
|
let addr = next_test_ip4();
|
|
@@ -1101,6 +1104,7 @@ mod tests {
|
|
assert_eq!(false, t!(stream.nodelay()));
|
|
}
|
|
|
|
+ #[cfg_attr(target_os = "macos", ignore)]
|
|
#[test]
|
|
fn ttl() {
|
|
let ttl = 100;
|
|
--
|
|
2.11.0
|
|
|