Skip to content

Commit

Permalink
auto merge of rust-lang#13689 : alexcrichton/rust/ignore-tcp-connect-…
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
bors committed Apr 23, 2014
2 parents bb580f1 + aa849fb commit b5dd3f0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/test/run-pass/tcp-connect-timeouts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fn start(argc: int, argv: **u8) -> int {
}

macro_rules! iotest (
{ fn $name:ident() $b:block $($a:attr)* } => (
{ fn $name:ident() $b:block $(#[$a:meta])* } => (
mod $name {
#![allow(unused_imports)]

Expand All @@ -40,8 +40,8 @@ macro_rules! iotest (

fn f() $b

$($a)* #[test] fn green() { f() }
$($a)* #[test] fn native() {
$(#[$a])* #[test] fn green() { f() }
$(#[$a])* #[test] fn native() {
use native;
let (tx, rx) = channel();
native::task::spawn(proc() { tx.send(f()) });
Expand Down Expand Up @@ -76,7 +76,7 @@ iotest!(fn eventual_timeout() {
}
}
fail!("never timed out!");
})
} #[ignore(cfg(target_os = "freebsd"))])

iotest!(fn timeout_success() {
let addr = next_test_ip4();
Expand Down

0 comments on commit b5dd3f0

Please sign in to comment.