---

yaml
---
r: 29824
b: refs/heads/incoming
c: 821fa33
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 4f3aeb4703f26d4063cd87bf2a0862051394b504
+refs/heads/incoming: 821fa337ffbc81fe5dad7dd1b3fa49dac84aa4ef
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/sync.rs

@@ -763,9 +763,51 @@ mod tests {
         assert result.is_err();
         // child task must have finished by the time try returns
         do m.lock_cond |cond| {
-            let _woken = cond.signal();
-            // FIXME(#3145) this doesn't work
-            //assert !woken;
+            let woken = cond.signal();
+            assert !woken;
+        }
+    }
+    #[test] #[ignore(cfg(windows))]
+    fn test_mutex_killed_broadcast() {
+        let m = ~mutex();
+        let m2 = ~m.clone();
+        let (c,p) = pipes::stream();
+
+        let result: result::result<(),()> = do task::try {
+            let mut sibling_convos = ~[];
+            for 2.times {
+                let (c,p) = pipes::stream();
+                let c = ~mut some(c);
+                vec::push(sibling_convos, p);
+                let mi = ~m2.clone();
+                // spawn sibling task
+                do task::spawn { // linked
+                    do mi.lock_cond |cond| {
+                        let c = option::swap_unwrap(c);
+                        c.send(()); // tell sibling to go ahead
+                        let _z = send_on_failure(c);
+                        cond.wait(); // block forever
+                    }
+                }
+            }
+            for vec::each(sibling_convos) |p| {
+                let _ = p.recv(); // wait for sibling to get in the mutex
+            }
+            do m2.lock { }
+            c.send(sibling_convos); // let parent wait on all children
+            fail;
+        };
+        assert result.is_err();
+        // child task must have finished by the time try returns
+        for vec::each(p.recv()) |p| { p.recv(); } // wait on all its siblings
+        do m.lock_cond |cond| {
+            let woken = cond.broadcast();
+            assert woken == 0;
+        }
+        struct send_on_failure {
+            c: pipes::chan<()>;
+            new(+c: pipes::chan<()>) { self.c = c; }
+            drop { self.c.send(()); }
         }
     }
     /************************************************************************