about summary refs log tree commit diff
path: root/src/lib/test.rs
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-09-12 09:36:51 -0700
committerBrian Anderson <banderson@mozilla.com>2011-09-12 09:36:51 -0700
commit393deeb06ff8017a93b0fd26c1f6968fdff2b15b (patch)
tree3dacb71e604095ec94a8f350f44467b7640f289d /src/lib/test.rs
parentedde2e0c457de6e5d17373bfa90ef319df4a1566 (diff)
parent6ffcfba6b990d6f27243e4dd6ddfffab141e1f44 (diff)
downloadrust-393deeb06ff8017a93b0fd26c1f6968fdff2b15b.tar.gz
rust-393deeb06ff8017a93b0fd26c1f6968fdff2b15b.zip
Merge branch 'unwind'
Conflicts:
	src/comp/middle/trans.rs
	src/comp/middle/trans_build.rs
	src/lib/run_program.rs
	src/test/compiletest/runtest.rs
Diffstat (limited to 'src/lib/test.rs')
-rw-r--r--src/lib/test.rs7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/test.rs b/src/lib/test.rs
index 1ad70db6f17..70de4565365 100644
--- a/src/lib/test.rs
+++ b/src/lib/test.rs
@@ -26,7 +26,6 @@ export configure_test_task;
 export joinable;
 
 native "rust" mod rustrt {
-    fn hack_allow_leaks();
     fn sched_threads() -> uint;
 }
 
@@ -324,12 +323,6 @@ fn configure_test_task() {
     // If this task fails we don't want that failure to propagate to the
     // test runner or else we couldn't keep running tests
     task::unsupervise();
-
-    // FIXME (236): Hack supreme - unwinding doesn't work yet so if this
-    // task fails memory will not be freed correctly. This turns off the
-    // sanity checks in the runtime's memory region for the task, so that
-    // the test runner can continue.
-    rustrt::hack_allow_leaks();
 }
 
 // Local Variables: