Skip to content

Commit b5dd3f0

Browse files
committed
auto merge of #13689 : alexcrichton/rust/ignore-tcp-connect-freebsd, r=brson
The BSD builders are failing with a different error that is not a timeout error (Connection reset by peer), so this test isn't really all that useful on freebsd. Due to a lack of a better idea of how to test a connect timeout, this test is going to just be ignored for now.
2 parents bb580f1 + aa849fb commit b5dd3f0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/test/run-pass/tcp-connect-timeouts.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fn start(argc: int, argv: **u8) -> int {
2929
}
3030

3131
macro_rules! iotest (
32-
{ fn $name:ident() $b:block $($a:attr)* } => (
32+
{ fn $name:ident() $b:block $(#[$a:meta])* } => (
3333
mod $name {
3434
#![allow(unused_imports)]
3535

@@ -40,8 +40,8 @@ macro_rules! iotest (
4040

4141
fn f() $b
4242

43-
$($a)* #[test] fn green() { f() }
44-
$($a)* #[test] fn native() {
43+
$(#[$a])* #[test] fn green() { f() }
44+
$(#[$a])* #[test] fn native() {
4545
use native;
4646
let (tx, rx) = channel();
4747
native::task::spawn(proc() { tx.send(f()) });
@@ -76,7 +76,7 @@ iotest!(fn eventual_timeout() {
7676
}
7777
}
7878
fail!("never timed out!");
79-
})
79+
} #[ignore(cfg(target_os = "freebsd"))])
8080

8181
iotest!(fn timeout_success() {
8282
let addr = next_test_ip4();

0 commit comments

Comments
 (0)