rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove more hacks from the test runner

Browse Source
This commit is contained in:
Brian Anderson
2011-08-17 12:59:48 -07:00
parent 87a782c0b3
commit 15f9f1a1f1
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/test.rs
View File

@@ -305,18 +305,12 @@ fn filter_tests(opts: &test_opts, tests: &[test_desc]) -> [test_desc] {
} }
type test_future = type test_future =
{test: test_desc, fnref: @fn() , wait: fn() -> test_result }; {test: test_desc, wait: fn() -> test_result };
fn run_test(test: &test_desc, to_task: &test_to_task) -> test_future { fn run_test(test: &test_desc, to_task: &test_to_task) -> test_future {
// FIXME: Because of the unsafe way we're passing the test function
// to the test task, we need to make sure we keep a reference to that
// function around for longer than the lifetime of the task. To that end
// we keep the function boxed in the test future.
let fnref = @test.fn;
if !test.ignore { if !test.ignore {
let test_task = to_task(*fnref); let test_task = to_task(test.fn);
ret {test: test, ret {test: test,
fnref: fnref,
wait: wait:
bind fn (test_task: task_id) -> test_result { bind fn (test_task: task_id) -> test_result {
alt task::join_id(test_task) { alt task::join_id(test_task) {
@@ -326,7 +320,6 @@ fn run_test(test: &test_desc, to_task: &test_to_task) -> test_future {
}(test_task)}; }(test_task)};
} else { } else {
ret {test: test, ret {test: test,
fnref: fnref,
wait: fn () -> test_result { tr_ignored }}; wait: fn () -> test_result { tr_ignored }};
} }
} }