auto merge of #11531 : brson/rust/yetmoreandroidfixes, r=alexcrichton

2 files changed, 4 insertions, 2 deletions

diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs
index 023a9bddca9..b901ea99cbe 100644
--- a/src/libstd/io/net/tcp.rs
+++ b/src/libstd/io/net/tcp.rs
@@ -136,6 +136,7 @@ mod test {
     use io::*;
     use prelude::*;
 
+    // FIXME #11530 this fails on android because tests are run as root
     iotest!(fn bind_error() {
         let mut called = false;
         io_error::cond.trap(|e| {
@@ -147,7 +148,7 @@ mod test {
             assert!(listener.is_none());
         });
         assert!(called);
-    } #[ignore(cfg(windows))])
+    } #[ignore(cfg(windows))] #[ignore(cfg(target_os = "android"))])
 
     iotest!(fn connect_error() {
         let mut called = false;
diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs
index 8a866c2a357..952ca7f730e 100644
--- a/src/libstd/io/net/udp.rs
+++ b/src/libstd/io/net/udp.rs
@@ -99,6 +99,7 @@ mod test {
     use super::*;
     use io::net::ip::{SocketAddr};
 
+    // FIXME #11530 this fails on android because tests are run as root
     iotest!(fn bind_error() {
         let mut called = false;
         io_error::cond.trap(|e| {
@@ -110,7 +111,7 @@ mod test {
             assert!(socket.is_none());
         });
         assert!(called);
-    } #[ignore(cfg(windows))])
+    } #[ignore(cfg(windows))] #[ignore(cfg(target_os = "android"))])
 
     iotest!(fn socket_smoke_test_ip4() {
         let server_ip = next_test_ip4();