---

yaml
---
r: 31180
b: refs/heads/dist-snap
c: 9728d14
h: refs/heads/master
v: v3

Author: eholk

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 7bba0ae97335a6790d08eed6a515b5c82f558edd
+refs/heads/dist-snap: 9728d14baeb1f93da6ebe524b840ec9868c296ae
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/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);