rustc: Disable another failing tcp test on Darwin.

Fixes #21936
NixOS · Jan 17, 2017 · a42044c · a42044c
1 parent 3e86a0b
commit a42044c
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch b/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch
@@ -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>
 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(-)
+ src/libstd/net/tcp.rs | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
 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
 +++ 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
      //        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)]
++    #[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 {
+@@ -1101,6 +1105,7 @@ mod tests {
          assert_eq!(false, t!(stream.nodelay()));
      }