---

yaml
---
r: 3942
b: refs/heads/master
c: 4a34776
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d475530a0aecbe243813b7cc23136058d114f2d
+refs/heads/master: 4a347760edb8d8c36b9468a5db7185ac0c922ab7

trunk/src/lib/test.rs

@@ -212,13 +212,32 @@ fn filter_tests(&test_opts opts, &test_desc[] tests) -> test_desc[] {
 
 fn run_test(&test_desc test) -> test_result {
     if (!test.ignore) {
-        test.fn();
-        ret tr_ok;
+        if (run_test_fn_in_task(test.fn)) {
+            ret tr_ok;
+        } else {
+            ret tr_failed;
+        }
     } else {
         ret tr_ignored;
     }
 }
 
+// We need to run our tests in another task in order to trap test failures.
+// But, at least currently, functions can't be used as spawn arguments so
+// we've got to treat our test functions as unsafe pointers.
+fn run_test_fn_in_task(&fn() f) -> bool {
+    fn run_task(*mutable fn() fptr) {
+        task::unsupervise();
+        (*fptr)()
+    }
+    auto fptr = ptr::addr_of(f);
+    auto test_task = spawn run_task(fptr);
+    ret alt (task::join(test_task)) {
+        task::tr_success { true }
+        task::tr_failure { false }
+    }
+}
+
 
 // Local Variables:
 // mode: rust;