---

yaml
---
r: 22518
b: refs/heads/master
c: 9728d14
h: refs/heads/master
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7bba0ae97335a6790d08eed6a515b5c82f558edd
+refs/heads/master: 9728d14baeb1f93da6ebe524b840ec9868c296ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/test/run-pass/pipe-select.rs

@@ -47,17 +47,19 @@ fn main() {
                              oneshot::server::waiting)
             = x;
         #error("selecting");
-        let (i, _, _) = select(~[left, right]);
-        #error("selected");
-        assert i == 1;
+        let (i, m, _) = select(~[left, right]);
+        #error("selected %?", i);
+        if m != none {
+            assert i == 1;
+        }
     });
 
     let (c1, p1) = oneshot::init();
     let (_c2, p2) = oneshot::init();
 
     let c = send(c, (p1, p2));
 
-    sleep(iotask, 1000);
+    sleep(iotask, 100);
 
     signal(c1);
 
@@ -66,7 +68,7 @@ fn main() {
 
     send(c, (p1, p2));
 
-    sleep(iotask, 1000);
+    sleep(iotask, 100);
 
     signal(c2);