OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the new task join methods in the test runner. Closes #826

Browse Source 
It should report failures properly again
This commit is contained in:
Brian Anderson 2011-08-17 15:33:29 -07:00
parent 15f9f1a1f1
commit ad598ebea0
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/test.rs
View File

@ -24,6 +24,7 @@ export parse_opts;
export test_to_task;
export default_test_to_task;
export configure_test_task;
export joinable;
native "rust" mod rustrt {
fn hack_allow_leaks();
@ -90,11 +91,13 @@ fn parse_opts(args: &[str]) : vec::is_not_empty(args) -> opt_res {
tag test_result { tr_ok; tr_failed; tr_ignored; }
type joinable = (task_id, comm::port<task::task_notification>);
// To get isolation and concurrency tests have to be run in their own tasks.
// In cases where test functions and closures it is not ok to just dump them
// into a task and run them, so this transformation gives the caller a chance
// to create the test task.
type test_to_task = fn(&fn()) -> task_id ;
type test_to_task = fn(&fn()) -> joinable;
// A simple console test runner
fn run_tests_console(opts: &test_opts, tests: &[test_desc]) -> bool {
@ -312,8 +315,8 @@ fn run_test(test: &test_desc, to_task: &test_to_task) -> test_future {
let test_task = to_task(test.fn);
ret {test: test,
wait:
bind fn (test_task: task_id) -> test_result {
alt task::join_id(test_task) {
bind fn (test_task: joinable)-> test_result {
alt task::join(test_task) {
task::tr_success. { tr_ok }
task::tr_failure. { tr_failed }
}
@ -326,12 +329,12 @@ fn run_test(test: &test_desc, to_task: &test_to_task) -> test_future {
// We need to run our tests in another task in order to trap test failures.
// This function only works with functions that don't contain closures.
fn default_test_to_task(f: &fn()) -> task_id {
fn default_test_to_task(f: &fn()) -> joinable {
fn run_task(f: fn()) {
configure_test_task();
f();
}
ret task::spawn(bind run_task(f));
ret task::spawn_joinable(bind run_task(f));
}
// Call from within a test task to make sure it's set up correctly

28
src/test/compiletest/compiletest.rs
View File

@ -121,7 +121,7 @@ fn test_opts(config: &config) -> test::test_opts {
}
type tests_and_conv_fn =
{tests: [test::test_desc], to_task: fn(&fn() ) -> task_id };
{tests: [test::test_desc], to_task: fn(&fn() ) -> test::joinable };
fn make_tests(cx: &cx) -> tests_and_conv_fn {
log #fmt("making tests from %s", cx.config.src_base);
@ -207,18 +207,26 @@ break up the config record and pass everything individually to the spawned
function.
*/
fn closure_to_task(cx: cx, configport: _port<[u8]>, testfn: &fn() ) -> task_id
fn closure_to_task(cx: cx, configport: _port<[u8]>, testfn: &fn() )
-> test::joinable
{
testfn();
let testfile = configport.recv();
ret task::_spawn(bind run_test_task(cx.config.compile_lib_path,
cx.config.run_lib_path, cx.config.rustc_path,
cx.config.src_base, cx.config.build_base,
cx.config.stage_id, mode_str(cx.config.mode),
cx.config.run_ignored, opt_str(cx.config.filter),
opt_str(cx.config.runtool),
opt_str(cx.config.rustcflags), cx.config.verbose,
cx.procsrv.chan, testfile));
let testthunk = bind run_test_task(cx.config.compile_lib_path,
cx.config.run_lib_path,
cx.config.rustc_path,
cx.config.src_base,
cx.config.build_base,
cx.config.stage_id,
mode_str(cx.config.mode),
cx.config.run_ignored,
opt_str(cx.config.filter),
opt_str(cx.config.runtool),
opt_str(cx.config.rustcflags),
cx.config.verbose,
cx.procsrv.chan,
testfile);
ret task::spawn_joinable(testthunk);
}
fn run_test_task(compile_lib_path: str, run_lib_path: str, rustc_path: str,