auto merge of #10098 : alexcrichton/rust/attempts, r=alexcrichton

It was pretty much a miracle that these tests were ever passing. They would
never have passed in the single threaded case because only one sigint in the
tests is ever generated, but when run in parallel two sigints will be generated.

2 files changed, 2 insertions, 1 deletions

diff --git a/src/libstd/rt/io/signal.rs b/src/libstd/rt/io/signal.rs
index a13fc19d000..d2266c8d5d6 100644
--- a/src/libstd/rt/io/signal.rs
+++ b/src/libstd/rt/io/signal.rs
@@ -183,7 +183,7 @@ mod test {
             Interrupt => (),
             s => fail!("Expected Interrupt, got {:?}", s),
         }
-        match s1.port.recv() {
+        match s2.port.recv() {
             Interrupt => (),
             s => fail!("Expected Interrupt, got {:?}", s),
         }
diff --git a/src/libstd/rt/uv/uvio.rs b/src/libstd/rt/uv/uvio.rs
index dc202ecc174..e0707a86f7b 100644
--- a/src/libstd/rt/uv/uvio.rs
+++ b/src/libstd/rt/uv/uvio.rs
@@ -2306,6 +2306,7 @@ fn test_read_read_read() {
 }
 
 #[test]
+#[ignore(cfg(windows))] // FIXME(#10102) the server never sees the second send
 fn test_udp_twice() {
     do run_in_mt_newsched_task {
         let server_addr = next_test_ip4();