about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-11-28 19:57:45 +0000
committerbors <bors@rust-lang.org>2015-11-28 19:57:45 +0000
commit7499558dd0a64b3485f2d1b3c7df05616893673d (patch)
treedc612e20f412123f9f81cb5e093b998c367278ec /src/libstd
parent0b3424321cf4a07f4c74c59b5785bcd6a17d4235 (diff)
parent6a7733a3584c74b94529458a27dbf7b87827b019 (diff)
downloadrust-7499558dd0a64b3485f2d1b3c7df05616893673d.tar.gz
rust-7499558dd0a64b3485f2d1b3c7df05616893673d.zip
Auto merge of #30092 - semarie:to_socket_addr_str_bad, r=alexcrichton
I don't reproduce it on severals hosts (virtual or real), so I can't
debug it. As Bitrig has disabled this test too, I will follow the same
here.

r? @alexcrichton
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/net/addr.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs
index 22bb5ff874d..c175482bbec 100644
--- a/src/libstd/net/addr.rs
+++ b/src/libstd/net/addr.rs
@@ -496,9 +496,9 @@ mod tests {
         assert!(tsa("localhost:23924").unwrap().contains(&a));
     }
 
-    // FIXME: figure out why this fails on bitrig and fix it
+    // FIXME: figure out why this fails on openbsd and bitrig and fix it
     #[test]
-    #[cfg(not(any(windows, target_os = "bitrig")))]
+    #[cfg(not(any(windows, target_os = "openbsd", target_os = "bitrig")))]
     fn to_socket_addr_str_bad() {
         assert!(tsa("1200::AB00:1234::2552:7777:1313:34300").is_err());
     }