Skip to content

Commit 8012045

Browse files
committed
---
yaml --- r: 98079 b: refs/heads/master c: 062b0fd h: refs/heads/master i: 98077: c147de7 98075: 1a86630 98071: bded818 98063: 4b13bd5 98047: 00729a7 v: v3
1 parent 3da58ff commit 8012045

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 279366a0b279658b52e646c637a56489e825ee67
2+
refs/heads/master: 062b0fd2649e7de848996d1193e4b462db33b2b1
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: b6400f998497c3958f40997a71756ead344a776d
55
refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36

trunk/src/libstd/io/net/tcp.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ mod test {
136136
use io::*;
137137
use prelude::*;
138138

139+
// FIXME #11530 this fails on android because tests are run as root
139140
iotest!(fn bind_error() {
140141
let mut called = false;
141142
io_error::cond.trap(|e| {
@@ -147,7 +148,7 @@ mod test {
147148
assert!(listener.is_none());
148149
});
149150
assert!(called);
150-
} #[ignore(cfg(windows))])
151+
} #[ignore(cfg(windows))] #[ignore(cfg(target_os = "android"))])
151152

152153
iotest!(fn connect_error() {
153154
let mut called = false;

trunk/src/libstd/io/net/udp.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ mod test {
9999
use super::*;
100100
use io::net::ip::{SocketAddr};
101101

102+
// FIXME #11530 this fails on android because tests are run as root
102103
iotest!(fn bind_error() {
103104
let mut called = false;
104105
io_error::cond.trap(|e| {
@@ -110,7 +111,7 @@ mod test {
110111
assert!(socket.is_none());
111112
});
112113
assert!(called);
113-
} #[ignore(cfg(windows))])
114+
} #[ignore(cfg(windows))] #[ignore(cfg(target_os = "android"))])
114115

115116
iotest!(fn socket_smoke_test_ip4() {
116117
let server_ip = next_test_ip4();

0 commit comments

Comments
 (0)