---

yaml
---
r: 130137
b: refs/heads/master
c: b090905
h: refs/heads/master
i:
  130135: 4376185
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f4aafd67137d0ea01a317311ca804f73543bc909
+refs/heads/master: b090905b1750983bf41094e7a940a333324e3e10
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 67b97ab6d2b7de9b69fd97dc171fcf8feec932ff
 refs/heads/try: 28d5878c1f0465c11c8e7a3085008b0c592d48d0

trunk/src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs

@@ -12,6 +12,7 @@
 // older versions of GDB too. A more extensive test can be found in
 // gdb-pretty-struct-and-enums.rs
 
+// ignore-test FIXME(#16919)
 // ignore-tidy-linelength
 // ignore-lldb
 // ignore-android: FIXME(#10381)

trunk/src/test/debuginfo/gdb-pretty-struct-and-enums.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-test FIXME(#16919)
 // ignore-tidy-linelength
 // ignore-lldb
 // ignore-android: FIXME(#10381)

trunk/src/test/run-pass/tcp-accept-stress.rs

@@ -8,11 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-macos osx really doesn't like cycling through large numbers of
-//              sockets as calls to connect() will start returning EADDRNOTAVAIL
-//              quite quickly and it takes a few seconds for the sockets to get
-//              recycled.
-
 #![feature(phase)]
 
 #[phase(plugin)]
@@ -25,7 +20,7 @@ use std::task::TaskBuilder;
 use native::NativeTaskBuilder;
 
 static N: uint = 8;
-static M: uint = 20;
+static M: uint = 100;
 
 green_start!(main)
 
@@ -45,12 +40,11 @@ fn test() {
     let mut a = l.listen().unwrap();
     let cnt = Arc::new(atomic::AtomicUint::new(0));
 
-    let (srv_tx, srv_rx) = channel();
-    let (cli_tx, cli_rx) = channel();
+    let (tx, rx) = channel();
     for _ in range(0, N) {
         let a = a.clone();
         let cnt = cnt.clone();
-        let srv_tx = srv_tx.clone();
+        let tx = tx.clone();
         spawn(proc() {
             let mut a = a;
             loop {
@@ -64,36 +58,33 @@ fn test() {
                     Err(e) => fail!("{}", e),
                 }
             }
-            srv_tx.send(());
+            tx.send(());
         });
     }
 
     for _ in range(0, N) {
-        let cli_tx = cli_tx.clone();
+        let tx = tx.clone();
         spawn(proc() {
             for _ in range(0, M) {
                 let _s = TcpStream::connect(addr.ip.to_string().as_slice(),
                                             addr.port).unwrap();
             }
-            cli_tx.send(());
+            tx.send(());
         });
     }
-    drop((cli_tx, srv_tx));
+    drop(tx);
 
     // wait for senders
-    if cli_rx.iter().take(N).count() != N {
-        a.close_accept().unwrap();
-        fail!("clients failed");
-    }
+    assert_eq!(rx.iter().take(N).count(), N);
 
     // wait for one acceptor to die
-    let _ = srv_rx.recv();
+    let _ = rx.recv();
 
     // Notify other receivers should die
     a.close_accept().unwrap();
 
     // wait for receivers
-    assert_eq!(srv_rx.iter().take(N - 1).count(), N - 1);
+    assert_eq!(rx.iter().take(N - 1).count(), N - 1);
 
     // Everything should have been accepted.
     assert_eq!(cnt.load(atomic::SeqCst), N * M);