---

yaml
---
r: 4561
b: refs/heads/master
c: 832d89d
h: refs/heads/master
i:
  4559: e1aed3c
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffd6ee0730f599de4765464f208d1c0cc3dcdfbc
+refs/heads/master: 832d89db4791b4487f739ecd6e10140da147a537

trunk/src/test/run-pass/task-killjoin.rs

@@ -1,33 +1,32 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
-
 // Create a task that is supervised by another task,
 // join the supervised task from the supervising task,
 // then fail the supervised task. The supervised task
 // will kill the supervising task, waking it up. The
 // supervising task no longer needs to be wakened when
 // the supervised task exits.
 
+use std;
+import std::task;
+
 fn supervised() {
     // Yield to make sure the supervisor joins before we
     // fail. This is currently not needed because the supervisor
     // runs first, but I can imagine that changing.
-    yield;
+    task::yield();
     fail;
 }
 
 fn supervisor() {
-    let task t = spawn "supervised" supervised();
-    join t;
+    // Unsupervise this task so the process doesn't return a failure status as
+    // a result of the main task being killed.
+    task::unsupervise();
+    let t = spawn supervised();
+    task::join(t);
 }
 
 fn main() {
-    // Start the test in another domain so that
-    // the process doesn't return a failure status as a result
-    // of the main task being killed.
-    let task dom2 = spawn thread "supervisor" supervisor();
-    join dom2;
+    let dom2 = spawn supervisor();
+    task::join(dom2);
 }
 
 // Local Variables: