From aed31ee08e9adff815e8a5df2499f2e4c6e7916b Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 6 Mar 2015 15:53:32 -0800
Subject: Test fixes and rebase conflicts

---
 src/libstd/net/addr.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/libstd/net')

diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs
index d975369af49..101aae3eb24 100644
--- a/src/libstd/net/addr.rs
+++ b/src/libstd/net/addr.rs
@@ -592,6 +592,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(not(windows))]
     fn to_socket_addr_str_bad() {
         assert!(tsa("1200::AB00:1234::2552:7777:1313:34300").is_err());
     }
-- 
cgit 1.4.1-3-g733a5