public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustc: Disable another failing tcp test on Darwin.

Browse Source 
Fixes #21936
This commit is contained in:
Moritz Ulrich 2017-01-17 10:58:38 +01:00
parent 3e86a0b496
commit a42044c6b5
No known key found for this signature in database
GPG Key ID: 45833CACBC407FA7
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch
View File

@ -1,29 +1,37 @@
From 0becb0b7cff0176279fc9f94c91299d788a43941 Mon Sep 17 00:00:00 2001 From 1d8a91d5b09cb762fe890d04bfb61b9eefd0624a Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de> From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 8 Jan 2017 10:28:17 +0100 Date: Sun, 8 Jan 2017 10:28:17 +0100
Subject: [PATCH] Disable libstd::net::tcp::{ttl, timeouts} on Darwin Subject: [PATCH] Disable libstd::net::tcp::{ttl, timeouts} on Darwin
--- ---
src/libstd/net/tcp.rs | 6 +++++- src/libstd/net/tcp.rs | 7 ++++++-
1 file changed, 5 insertions(+), 1 deletion(-) 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
index 0e7c5b0671..189c31b958 100644 index 0e7c5b0671..d42fd26267 100644
--- a/src/libstd/net/tcp.rs --- a/src/libstd/net/tcp.rs
+++ b/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs
@@ -1022,7 +1022,10 @@ mod tests { @@ -551,6 +551,7 @@ mod tests {
})
}
+ #[cfg_attr(target_os = "macos", ignore)]
#[test]
fn write_close() {
each_ip(&mut |addr| {
@@ -1022,7 +1023,10 @@ mod tests {
// FIXME: re-enabled bitrig/openbsd tests once their socket timeout code // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
// no longer has rounding errors. // 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"), ignore)]
+ #[cfg_attr(any(target_os = "bitrig", + #[cfg_attr(any(target_os = "bitrig",
+ target_os = "netbsd", + target_os = "netbsd",
+ target_os = "openbsd", + target_os = "openbsd",
+ target_os = "macos"), ignore)] + target_os = "macos"), ignore)]
#[test] #[test]
fn timeouts() { fn timeouts() {
let addr = next_test_ip4(); let addr = next_test_ip4();
@@ -1101,6 +1104,7 @@ mod tests { @@ -1101,6 +1105,7 @@ mod tests {
assert_eq!(false, t!(stream.nodelay())); assert_eq!(false, t!(stream.nodelay()));
} }