---

yaml
---
r: 22639
b: refs/heads/master
c: d1e3e62
h: refs/heads/master
i:
  22637: 96427d5
  22635: 4ce51a8
  22631: 1addea0
  22623: ecd562a
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 07bb1aefc9a88e213c8e36f515ffb6a9148614fd
+refs/heads/master: d1e3e62300cad92a79c8716d6bfe7cb460ae4b09
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/task.rs

@@ -1156,6 +1156,9 @@ fn test_spawn_raw_unsupervise() {
 // The following 8 tests test the following 2^3 combinations:
 // {un,}linked {un,}supervised failure propagation {up,down}wards.
 
+// !!! These tests are dangerous. If something is buggy, they will hang, !!!
+// !!! instead of exiting cleanly. This might wedge the buildbots.       !!!
+
 #[test] #[ignore(cfg(windows))]
 fn test_spawn_unlinked_unsup_no_fail_down() { // grandchild sends on a port
     let po = comm::port();
@@ -1232,7 +1235,7 @@ fn test_spawn_linked_unsup_fail_down() { // parent fails; child fails
 
 // A bonus linked failure test
 
-#[test] #[should_fail] #[ignore(cfg(windows))]
+#[test] #[should_fail] // #[ignore(cfg(windows))]
 #[ignore] // FIXME (#1868) (bblum) make this work
 fn test_spawn_unlinked_sup_propagate_grandchild() {
     let builder = task::builder();