2012-12-03 18:48:01 -06:00
|
|
|
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2012-03-07 20:17:30 -06:00
|
|
|
#[doc(hidden)];
|
|
|
|
|
2011-07-09 18:08:03 -05:00
|
|
|
// Support code for rustc's built in test runner generator. Currently,
|
|
|
|
// none of this is meant for users. It is intended to support the
|
|
|
|
// simplest interface possible for representing and running tests
|
|
|
|
// while providing a base that other test frameworks may build off of.
|
|
|
|
|
2012-10-04 21:58:31 -05:00
|
|
|
#[forbid(deprecated_mode)];
|
2012-09-19 20:51:35 -05:00
|
|
|
|
2012-12-23 16:41:37 -06:00
|
|
|
use getopts;
|
|
|
|
use sort;
|
|
|
|
use term;
|
|
|
|
|
2012-09-04 13:23:53 -05:00
|
|
|
use core::cmp::Eq;
|
2012-12-23 16:41:37 -06:00
|
|
|
use core::either::Either;
|
|
|
|
use core::either;
|
|
|
|
use core::io::WriterUtil;
|
|
|
|
use core::io;
|
|
|
|
use core::libc::size_t;
|
|
|
|
use core::oldcomm;
|
|
|
|
use core::option;
|
|
|
|
use core::result;
|
|
|
|
use core::str;
|
|
|
|
use core::task::TaskBuilder;
|
|
|
|
use core::task;
|
|
|
|
use core::vec;
|
2011-07-16 19:04:20 -05:00
|
|
|
|
2011-11-16 22:49:38 -06:00
|
|
|
#[abi = "cdecl"]
|
2012-07-03 18:11:00 -05:00
|
|
|
extern mod rustrt {
|
2012-09-21 20:10:45 -05:00
|
|
|
#[legacy_exports];
|
2012-12-23 16:41:37 -06:00
|
|
|
fn rust_sched_threads() -> size_t;
|
2011-07-25 20:07:25 -05:00
|
|
|
}
|
|
|
|
|
2011-07-09 18:08:03 -05:00
|
|
|
// The name of a test. By convention this follows the rules for rust
|
2011-09-26 12:51:23 -05:00
|
|
|
// paths; i.e. it should be a series of identifiers seperated by double
|
2011-07-09 18:08:03 -05:00
|
|
|
// colons. This way if some test runner wants to arrange the tests
|
2011-09-26 12:51:23 -05:00
|
|
|
// hierarchically it may.
|
2012-10-01 19:32:50 -05:00
|
|
|
pub type TestName = ~str;
|
2011-07-09 18:08:03 -05:00
|
|
|
|
|
|
|
// A function that runs a test. If the function returns successfully,
|
|
|
|
// the test succeeds; if the function fails then the test fails. We
|
|
|
|
// may need to come up with a more clever definition of test in order
|
|
|
|
// to support isolation of tests into tasks.
|
2012-10-01 19:32:50 -05:00
|
|
|
pub type TestFn = fn~();
|
2011-07-09 18:08:03 -05:00
|
|
|
|
|
|
|
// The definition of a single test. A test runner will run a list of
|
|
|
|
// these.
|
2012-10-01 19:32:50 -05:00
|
|
|
pub type TestDesc = {
|
2012-09-04 20:05:57 -05:00
|
|
|
name: TestName,
|
2012-09-12 16:51:38 -05:00
|
|
|
testfn: TestFn,
|
2011-11-01 12:31:23 -05:00
|
|
|
ignore: bool,
|
|
|
|
should_fail: bool
|
2011-10-13 18:42:43 -05:00
|
|
|
};
|
2011-07-09 18:08:03 -05:00
|
|
|
|
|
|
|
// The default console test runner. It accepts the command line
|
|
|
|
// arguments and a vector of test_descs (generated at compile time).
|
2012-10-01 19:32:50 -05:00
|
|
|
pub fn test_main(args: &[~str], tests: &[TestDesc]) {
|
2011-07-27 07:19:39 -05:00
|
|
|
let opts =
|
2012-08-06 14:34:08 -05:00
|
|
|
match parse_opts(args) {
|
2012-09-28 02:22:18 -05:00
|
|
|
either::Left(move o) => o,
|
|
|
|
either::Right(move m) => fail m
|
2011-07-27 07:19:39 -05:00
|
|
|
};
|
2012-09-19 20:51:35 -05:00
|
|
|
if !run_tests_console(&opts, tests) { fail ~"Some tests failed"; }
|
2011-07-09 18:08:03 -05:00
|
|
|
}
|
|
|
|
|
2012-10-01 19:32:50 -05:00
|
|
|
pub type TestOpts = {filter: Option<~str>, run_ignored: bool,
|
2012-08-20 14:23:37 -05:00
|
|
|
logfile: Option<~str>};
|
2011-07-14 18:05:33 -05:00
|
|
|
|
2012-09-04 20:05:57 -05:00
|
|
|
type OptRes = Either<TestOpts, ~str>;
|
2011-07-14 18:05:33 -05:00
|
|
|
|
|
|
|
// Parses command line arguments into test options
|
2013-01-08 21:29:16 -06:00
|
|
|
fn parse_opts(args: &[~str]) -> OptRes {
|
2011-08-31 18:56:38 -05:00
|
|
|
let args_ = vec::tail(args);
|
2012-07-14 00:57:48 -05:00
|
|
|
let opts = ~[getopts::optflag(~"ignored"), getopts::optopt(~"logfile")];
|
2012-07-31 18:38:41 -05:00
|
|
|
let matches =
|
2012-08-06 14:34:08 -05:00
|
|
|
match getopts::getopts(args_, opts) {
|
2012-09-28 02:22:18 -05:00
|
|
|
Ok(move m) => m,
|
|
|
|
Err(move f) => return either::Right(getopts::fail_str(f))
|
2011-07-27 07:19:39 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
let filter =
|
2012-07-31 18:38:41 -05:00
|
|
|
if vec::len(matches.free) > 0u {
|
2012-08-20 14:23:37 -05:00
|
|
|
option::Some(matches.free[0])
|
|
|
|
} else { option::None };
|
2011-07-14 18:05:33 -05:00
|
|
|
|
2012-11-24 14:49:31 -06:00
|
|
|
let run_ignored = getopts::opt_present(&matches, ~"ignored");
|
|
|
|
let logfile = getopts::opt_maybe_str(&matches, ~"logfile");
|
2011-07-14 18:05:33 -05:00
|
|
|
|
2012-04-03 10:27:51 -05:00
|
|
|
let test_opts = {filter: filter, run_ignored: run_ignored,
|
2012-05-24 16:49:39 -05:00
|
|
|
logfile: logfile};
|
2011-07-11 18:33:21 -05:00
|
|
|
|
2012-08-14 18:54:13 -05:00
|
|
|
return either::Left(test_opts);
|
2011-07-11 18:33:21 -05:00
|
|
|
}
|
|
|
|
|
2012-12-11 17:16:36 -06:00
|
|
|
#[deriving_eq]
|
2012-10-01 19:32:50 -05:00
|
|
|
pub enum TestResult { TrOk, TrFailed, TrIgnored, }
|
2011-07-14 13:29:54 -05:00
|
|
|
|
2012-09-04 20:05:57 -05:00
|
|
|
type ConsoleTestState =
|
2012-08-14 15:38:35 -05:00
|
|
|
@{out: io::Writer,
|
2012-08-20 14:23:37 -05:00
|
|
|
log_out: Option<io::Writer>,
|
2012-04-13 05:34:41 -05:00
|
|
|
use_color: bool,
|
2012-03-26 20:35:18 -05:00
|
|
|
mut total: uint,
|
|
|
|
mut passed: uint,
|
|
|
|
mut failed: uint,
|
|
|
|
mut ignored: uint,
|
2012-09-04 20:05:57 -05:00
|
|
|
mut failures: ~[TestDesc]};
|
2012-03-12 19:31:03 -05:00
|
|
|
|
2011-07-11 18:33:21 -05:00
|
|
|
// A simple console test runner
|
2012-10-01 19:32:50 -05:00
|
|
|
pub fn run_tests_console(opts: &TestOpts,
|
2012-09-19 20:51:35 -05:00
|
|
|
tests: &[TestDesc]) -> bool {
|
2011-07-11 18:33:21 -05:00
|
|
|
|
2012-09-19 20:51:35 -05:00
|
|
|
fn callback(event: &TestEvent, st: ConsoleTestState) {
|
2012-08-28 21:31:56 -05:00
|
|
|
debug!("callback(event=%?)", event);
|
2012-09-19 20:51:35 -05:00
|
|
|
match *event {
|
2012-09-28 02:22:18 -05:00
|
|
|
TeFiltered(ref filtered_tests) => {
|
|
|
|
st.total = filtered_tests.len();
|
2012-07-14 00:57:48 -05:00
|
|
|
let noun = if st.total != 1u { ~"tests" } else { ~"test" };
|
2012-08-22 19:24:52 -05:00
|
|
|
st.out.write_line(fmt!("\nrunning %u %s", st.total, noun));
|
2011-08-01 13:26:29 -05:00
|
|
|
}
|
2012-09-28 04:26:20 -05:00
|
|
|
TeWait(ref test) => st.out.write_str(
|
|
|
|
fmt!("test %s ... ", test.name)),
|
2012-09-28 02:22:18 -05:00
|
|
|
TeResult(copy test, result) => {
|
2012-08-06 14:34:08 -05:00
|
|
|
match st.log_out {
|
2012-09-19 20:51:35 -05:00
|
|
|
Some(f) => write_log(f, result, &test),
|
2012-08-20 14:23:37 -05:00
|
|
|
None => ()
|
2012-04-03 10:27:51 -05:00
|
|
|
}
|
2012-08-06 14:34:08 -05:00
|
|
|
match result {
|
2012-09-04 20:05:57 -05:00
|
|
|
TrOk => {
|
2011-07-29 21:54:05 -05:00
|
|
|
st.passed += 1u;
|
2012-04-13 05:34:41 -05:00
|
|
|
write_ok(st.out, st.use_color);
|
2012-07-14 00:57:48 -05:00
|
|
|
st.out.write_line(~"");
|
2011-07-29 21:54:05 -05:00
|
|
|
}
|
2012-09-04 20:05:57 -05:00
|
|
|
TrFailed => {
|
2011-07-29 21:54:05 -05:00
|
|
|
st.failed += 1u;
|
2012-04-13 05:34:41 -05:00
|
|
|
write_failed(st.out, st.use_color);
|
2012-07-14 00:57:48 -05:00
|
|
|
st.out.write_line(~"");
|
2012-09-19 00:35:42 -05:00
|
|
|
st.failures.push(move test);
|
2011-07-29 21:54:05 -05:00
|
|
|
}
|
2012-09-04 20:05:57 -05:00
|
|
|
TrIgnored => {
|
2011-07-29 21:54:05 -05:00
|
|
|
st.ignored += 1u;
|
2012-04-13 05:34:41 -05:00
|
|
|
write_ignored(st.out, st.use_color);
|
2012-07-14 00:57:48 -05:00
|
|
|
st.out.write_line(~"");
|
2011-07-29 21:54:05 -05:00
|
|
|
}
|
|
|
|
}
|
2011-07-27 07:19:39 -05:00
|
|
|
}
|
2011-07-11 13:19:32 -05:00
|
|
|
}
|
2011-07-09 18:08:03 -05:00
|
|
|
}
|
|
|
|
|
2012-08-06 14:34:08 -05:00
|
|
|
let log_out = match opts.logfile {
|
2012-09-28 02:22:18 -05:00
|
|
|
Some(ref path) => match io::file_writer(&Path(*path),
|
2012-08-14 15:38:35 -05:00
|
|
|
~[io::Create, io::Truncate]) {
|
2012-08-26 18:54:31 -05:00
|
|
|
result::Ok(w) => Some(w),
|
2012-09-28 02:22:18 -05:00
|
|
|
result::Err(ref s) => {
|
|
|
|
fail(fmt!("can't open output file: %s", *s))
|
2012-08-03 21:59:04 -05:00
|
|
|
}
|
2012-08-06 19:14:32 -05:00
|
|
|
},
|
2012-08-20 14:23:37 -05:00
|
|
|
None => None
|
2012-04-13 05:34:45 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
let st =
|
|
|
|
@{out: io::stdout(),
|
|
|
|
log_out: log_out,
|
|
|
|
use_color: use_color(),
|
|
|
|
mut total: 0u,
|
|
|
|
mut passed: 0u,
|
|
|
|
mut failed: 0u,
|
|
|
|
mut ignored: 0u,
|
2012-06-29 18:26:56 -05:00
|
|
|
mut failures: ~[]};
|
2012-04-13 05:34:45 -05:00
|
|
|
|
2012-09-19 20:51:35 -05:00
|
|
|
run_tests(opts, tests, |x| callback(&x, st));
|
2012-04-13 05:34:45 -05:00
|
|
|
|
2011-08-19 17:16:48 -05:00
|
|
|
assert (st.passed + st.failed + st.ignored == st.total);
|
2011-07-29 21:54:05 -05:00
|
|
|
let success = st.failed == 0u;
|
2011-07-11 13:19:32 -05:00
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
if !success {
|
2012-03-12 19:31:03 -05:00
|
|
|
print_failures(st);
|
2011-07-22 00:26:53 -05:00
|
|
|
}
|
|
|
|
|
2012-08-22 19:24:52 -05:00
|
|
|
st.out.write_str(fmt!("\nresult: "));
|
2012-04-13 05:34:41 -05:00
|
|
|
if success {
|
2012-04-13 05:34:45 -05:00
|
|
|
// There's no parallelism at this point so it's safe to use color
|
2012-04-13 05:34:41 -05:00
|
|
|
write_ok(st.out, true);
|
|
|
|
} else { write_failed(st.out, true); }
|
2012-08-22 19:24:52 -05:00
|
|
|
st.out.write_str(fmt!(". %u passed; %u failed; %u ignored\n\n", st.passed,
|
|
|
|
st.failed, st.ignored));
|
2011-07-11 13:19:32 -05:00
|
|
|
|
2012-08-01 19:30:05 -05:00
|
|
|
return success;
|
2011-07-11 13:19:32 -05:00
|
|
|
|
2012-09-19 20:51:35 -05:00
|
|
|
fn write_log(out: io::Writer, result: TestResult, test: &TestDesc) {
|
2012-08-22 19:24:52 -05:00
|
|
|
out.write_line(fmt!("%s %s",
|
2012-08-06 14:34:08 -05:00
|
|
|
match result {
|
2012-09-04 20:05:57 -05:00
|
|
|
TrOk => ~"ok",
|
|
|
|
TrFailed => ~"failed",
|
|
|
|
TrIgnored => ~"ignored"
|
2012-08-22 19:24:52 -05:00
|
|
|
}, test.name));
|
2012-04-03 10:27:51 -05:00
|
|
|
}
|
|
|
|
|
2012-08-14 15:38:35 -05:00
|
|
|
fn write_ok(out: io::Writer, use_color: bool) {
|
2012-07-14 00:57:48 -05:00
|
|
|
write_pretty(out, ~"ok", term::color_green, use_color);
|
2011-07-27 07:19:39 -05:00
|
|
|
}
|
2011-07-11 13:19:32 -05:00
|
|
|
|
2012-08-14 15:38:35 -05:00
|
|
|
fn write_failed(out: io::Writer, use_color: bool) {
|
2012-07-14 00:57:48 -05:00
|
|
|
write_pretty(out, ~"FAILED", term::color_red, use_color);
|
2011-07-11 13:19:32 -05:00
|
|
|
}
|
2011-07-14 13:29:54 -05:00
|
|
|
|
2012-08-14 15:38:35 -05:00
|
|
|
fn write_ignored(out: io::Writer, use_color: bool) {
|
2012-07-14 00:57:48 -05:00
|
|
|
write_pretty(out, ~"ignored", term::color_yellow, use_color);
|
2011-07-15 02:31:00 -05:00
|
|
|
}
|
|
|
|
|
2012-09-19 20:51:35 -05:00
|
|
|
fn write_pretty(out: io::Writer, word: &str, color: u8, use_color: bool) {
|
2012-04-13 05:34:41 -05:00
|
|
|
if use_color && term::color_supported() {
|
2012-01-11 08:15:54 -06:00
|
|
|
term::fg(out, color);
|
2011-07-14 13:29:54 -05:00
|
|
|
}
|
2011-09-01 01:46:44 -05:00
|
|
|
out.write_str(word);
|
2012-04-13 05:34:41 -05:00
|
|
|
if use_color && term::color_supported() {
|
2012-01-11 08:15:54 -06:00
|
|
|
term::reset(out);
|
2011-07-14 13:29:54 -05:00
|
|
|
}
|
|
|
|
}
|
2011-07-09 18:08:03 -05:00
|
|
|
}
|
|
|
|
|
2012-09-04 20:05:57 -05:00
|
|
|
fn print_failures(st: ConsoleTestState) {
|
2012-07-14 00:57:48 -05:00
|
|
|
st.out.write_line(~"\nfailures:");
|
2012-05-18 12:40:54 -05:00
|
|
|
let failures = copy st.failures;
|
2012-06-30 18:19:07 -05:00
|
|
|
let failures = vec::map(failures, |test| test.name);
|
2012-09-27 19:05:13 -05:00
|
|
|
let failures = do sort::merge_sort(failures) |x, y| { str::le(*x, *y) };
|
2012-09-18 23:41:13 -05:00
|
|
|
for vec::each(failures) |name| {
|
2012-09-18 23:41:37 -05:00
|
|
|
st.out.write_line(fmt!(" %s", *name));
|
2012-03-12 19:31:03 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_sort_failures_before_printing_them() {
|
2012-09-14 11:40:28 -05:00
|
|
|
let s = do io::with_str_writer |wr| {
|
|
|
|
let test_a = {
|
|
|
|
name: ~"a",
|
|
|
|
testfn: fn~() { },
|
|
|
|
ignore: false,
|
|
|
|
should_fail: false
|
|
|
|
};
|
2012-03-12 19:31:03 -05:00
|
|
|
|
2012-09-14 11:40:28 -05:00
|
|
|
let test_b = {
|
|
|
|
name: ~"b",
|
|
|
|
testfn: fn~() { },
|
|
|
|
ignore: false,
|
|
|
|
should_fail: false
|
|
|
|
};
|
2012-03-12 19:31:03 -05:00
|
|
|
|
2012-09-14 11:40:28 -05:00
|
|
|
let st =
|
|
|
|
@{out: wr,
|
|
|
|
log_out: option::None,
|
|
|
|
use_color: false,
|
|
|
|
mut total: 0u,
|
|
|
|
mut passed: 0u,
|
|
|
|
mut failed: 0u,
|
|
|
|
mut ignored: 0u,
|
2012-09-19 00:35:42 -05:00
|
|
|
mut failures: ~[move test_b, move test_a]};
|
2012-03-12 19:31:03 -05:00
|
|
|
|
2012-09-14 11:40:28 -05:00
|
|
|
print_failures(st);
|
|
|
|
};
|
2012-03-12 19:31:03 -05:00
|
|
|
|
2012-09-21 21:37:57 -05:00
|
|
|
let apos = str::find_str(s, ~"a").get();
|
|
|
|
let bpos = str::find_str(s, ~"b").get();
|
2012-03-12 19:31:03 -05:00
|
|
|
assert apos < bpos;
|
|
|
|
}
|
|
|
|
|
2012-08-01 19:30:05 -05:00
|
|
|
fn use_color() -> bool { return get_concurrency() == 1u; }
|
2012-04-13 05:34:41 -05:00
|
|
|
|
2012-09-04 20:05:57 -05:00
|
|
|
enum TestEvent {
|
|
|
|
TeFiltered(~[TestDesc]),
|
|
|
|
TeWait(TestDesc),
|
|
|
|
TeResult(TestDesc, TestResult),
|
2011-07-29 21:54:05 -05:00
|
|
|
}
|
|
|
|
|
2012-09-04 20:05:57 -05:00
|
|
|
type MonitorMsg = (TestDesc, TestResult);
|
2012-01-19 16:36:11 -06:00
|
|
|
|
2013-01-08 21:29:16 -06:00
|
|
|
fn run_tests(opts: &TestOpts, tests: &[TestDesc],
|
2012-10-03 14:21:48 -05:00
|
|
|
callback: fn@(e: TestEvent)) {
|
2013-01-08 21:29:16 -06:00
|
|
|
|
2012-03-14 13:03:56 -05:00
|
|
|
let mut filtered_tests = filter_tests(opts, tests);
|
2012-09-04 20:05:57 -05:00
|
|
|
callback(TeFiltered(copy filtered_tests));
|
2011-07-29 21:54:05 -05:00
|
|
|
|
2012-01-19 15:44:07 -06:00
|
|
|
// It's tempting to just spawn all the tests at once, but since we have
|
|
|
|
// many tests that run in other processes we would be making a big mess.
|
2011-07-29 21:54:05 -05:00
|
|
|
let concurrency = get_concurrency();
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("using %u test tasks", concurrency);
|
2012-01-19 16:36:11 -06:00
|
|
|
|
2011-08-15 18:38:23 -05:00
|
|
|
let total = vec::len(filtered_tests);
|
2012-09-10 19:50:48 -05:00
|
|
|
let mut run_idx = 0;
|
|
|
|
let mut wait_idx = 0;
|
|
|
|
let mut done_idx = 0;
|
2011-07-29 21:54:05 -05:00
|
|
|
|
2012-12-13 16:18:47 -06:00
|
|
|
let p = oldcomm::Port();
|
|
|
|
let ch = oldcomm::Chan(&p);
|
2012-01-19 16:36:11 -06:00
|
|
|
|
|
|
|
while done_idx < total {
|
|
|
|
while wait_idx < concurrency && run_idx < total {
|
2012-06-04 16:31:25 -05:00
|
|
|
let test = copy filtered_tests[run_idx];
|
2012-09-10 19:50:48 -05:00
|
|
|
if concurrency == 1 {
|
2012-02-18 18:30:07 -06:00
|
|
|
// We are doing one test at a time so we can print the name
|
|
|
|
// of the test before we run it. Useful for debugging tests
|
|
|
|
// that hang forever.
|
2012-09-04 20:05:57 -05:00
|
|
|
callback(TeWait(copy test));
|
2012-02-18 18:30:07 -06:00
|
|
|
}
|
2012-09-10 19:50:48 -05:00
|
|
|
run_test(move test, ch);
|
|
|
|
wait_idx += 1;
|
|
|
|
run_idx += 1;
|
2011-07-29 21:54:05 -05:00
|
|
|
}
|
|
|
|
|
2012-12-13 16:18:47 -06:00
|
|
|
let (test, result) = oldcomm::recv(p);
|
2012-09-10 19:50:48 -05:00
|
|
|
if concurrency != 1 {
|
2012-09-04 20:05:57 -05:00
|
|
|
callback(TeWait(copy test));
|
2012-02-18 18:30:07 -06:00
|
|
|
}
|
2012-09-10 19:50:48 -05:00
|
|
|
callback(TeResult(move test, result));
|
|
|
|
wait_idx -= 1;
|
|
|
|
done_idx += 1;
|
2011-07-29 21:54:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-02-07 20:55:02 -06:00
|
|
|
// Windows tends to dislike being overloaded with threads.
|
2012-06-07 23:38:25 -05:00
|
|
|
#[cfg(windows)]
|
2012-02-07 20:55:02 -06:00
|
|
|
const sched_overcommit : uint = 1u;
|
|
|
|
|
2012-06-07 23:38:25 -05:00
|
|
|
#[cfg(unix)]
|
2012-02-07 20:55:02 -06:00
|
|
|
const sched_overcommit : uint = 4u;
|
|
|
|
|
2012-01-19 16:43:56 -06:00
|
|
|
fn get_concurrency() -> uint {
|
2012-09-18 05:28:05 -05:00
|
|
|
let threads = rustrt::rust_sched_threads() as uint;
|
2012-01-19 16:43:56 -06:00
|
|
|
if threads == 1u { 1u }
|
2012-02-07 20:55:02 -06:00
|
|
|
else { threads * sched_overcommit }
|
2012-01-19 16:43:56 -06:00
|
|
|
}
|
2011-07-25 17:21:36 -05:00
|
|
|
|
Nomenclature fixes in the lint checker. Fewer double-negatives.
New style is allow(foo), warn(foo), deny(foo) and forbid(foo),
mirrored by -A foo, -W foo, -D foo and -F foo on command line.
These replace -W no-foo, -W foo, -W err-foo, respectively.
Forbid is new, and means "deny, and you can't override it".
2012-07-26 19:08:21 -05:00
|
|
|
#[allow(non_implicitly_copyable_typarams)]
|
2013-01-08 21:29:16 -06:00
|
|
|
fn filter_tests(opts: &TestOpts,
|
|
|
|
tests: &[TestDesc]) -> ~[TestDesc] {
|
2012-09-19 20:51:35 -05:00
|
|
|
let mut filtered = vec::slice(tests, 0, tests.len());
|
2011-07-11 18:33:21 -05:00
|
|
|
|
2011-07-16 19:04:20 -05:00
|
|
|
// Remove tests that don't match the test filter
|
2012-09-21 21:37:57 -05:00
|
|
|
filtered = if opts.filter.is_none() {
|
2012-09-10 19:50:48 -05:00
|
|
|
move filtered
|
2011-10-13 18:42:43 -05:00
|
|
|
} else {
|
|
|
|
let filter_str =
|
2012-08-06 14:34:08 -05:00
|
|
|
match opts.filter {
|
2012-09-28 02:22:18 -05:00
|
|
|
option::Some(copy f) => f,
|
2012-08-20 14:23:37 -05:00
|
|
|
option::None => ~""
|
2011-07-27 07:19:39 -05:00
|
|
|
};
|
2011-07-14 18:05:33 -05:00
|
|
|
|
2012-09-19 20:51:35 -05:00
|
|
|
fn filter_fn(test: &TestDesc, filter_str: &str) ->
|
2012-09-04 20:05:57 -05:00
|
|
|
Option<TestDesc> {
|
2012-02-13 00:00:56 -06:00
|
|
|
if str::contains(test.name, filter_str) {
|
2012-09-19 20:51:35 -05:00
|
|
|
return option::Some(copy *test);
|
2012-08-20 14:23:37 -05:00
|
|
|
} else { return option::None; }
|
2011-10-13 18:42:43 -05:00
|
|
|
}
|
|
|
|
|
2012-09-28 00:20:47 -05:00
|
|
|
vec::filter_map(filtered, |x| filter_fn(x, filter_str))
|
2011-10-13 18:42:43 -05:00
|
|
|
};
|
|
|
|
|
2011-07-16 19:04:20 -05:00
|
|
|
// Maybe pull out the ignored test and unignore them
|
2011-10-13 18:42:43 -05:00
|
|
|
filtered = if !opts.run_ignored {
|
2012-09-10 19:50:48 -05:00
|
|
|
move filtered
|
2011-10-13 18:42:43 -05:00
|
|
|
} else {
|
2012-09-19 20:51:35 -05:00
|
|
|
fn filter(test: &TestDesc) -> Option<TestDesc> {
|
2011-10-13 18:42:43 -05:00
|
|
|
if test.ignore {
|
2012-08-20 14:23:37 -05:00
|
|
|
return option::Some({name: test.name,
|
2012-09-12 16:51:38 -05:00
|
|
|
testfn: copy test.testfn,
|
2011-11-01 12:31:23 -05:00
|
|
|
ignore: false,
|
|
|
|
should_fail: test.should_fail});
|
2012-08-20 14:23:37 -05:00
|
|
|
} else { return option::None; }
|
2011-07-14 18:05:33 -05:00
|
|
|
};
|
|
|
|
|
2012-09-28 00:20:47 -05:00
|
|
|
vec::filter_map(filtered, |x| filter(x))
|
2011-10-13 18:42:43 -05:00
|
|
|
};
|
|
|
|
|
2011-07-16 19:04:20 -05:00
|
|
|
// Sort the tests alphabetically
|
2012-08-02 17:42:56 -05:00
|
|
|
filtered = {
|
2012-09-04 20:05:57 -05:00
|
|
|
pure fn lteq(t1: &TestDesc, t2: &TestDesc) -> bool {
|
2012-08-29 21:23:15 -05:00
|
|
|
str::le(t1.name, t2.name)
|
2012-08-02 17:42:56 -05:00
|
|
|
}
|
2012-09-27 19:05:13 -05:00
|
|
|
sort::merge_sort(filtered, lteq)
|
2012-08-02 17:42:56 -05:00
|
|
|
};
|
2011-07-11 18:33:21 -05:00
|
|
|
|
2012-09-10 19:50:48 -05:00
|
|
|
move filtered
|
2011-07-11 18:33:21 -05:00
|
|
|
}
|
2011-07-09 18:08:03 -05:00
|
|
|
|
2012-09-04 20:05:57 -05:00
|
|
|
type TestFuture = {test: TestDesc, wait: fn@() -> TestResult};
|
2011-07-25 17:21:36 -05:00
|
|
|
|
2013-01-08 21:29:16 -06:00
|
|
|
fn run_test(test: TestDesc, monitor_ch: oldcomm::Chan<MonitorMsg>) {
|
2011-11-01 12:31:23 -05:00
|
|
|
if test.ignore {
|
2012-12-13 16:18:47 -06:00
|
|
|
oldcomm::send(monitor_ch, (copy test, TrIgnored));
|
2012-08-01 19:30:05 -05:00
|
|
|
return;
|
2011-11-01 12:31:23 -05:00
|
|
|
}
|
|
|
|
|
2012-09-10 19:50:48 -05:00
|
|
|
do task::spawn |move test| {
|
2012-09-12 16:51:38 -05:00
|
|
|
let testfn = copy test.testfn;
|
2012-08-20 14:23:37 -05:00
|
|
|
let mut result_future = None; // task::future_result(builder);
|
2012-08-07 13:26:03 -05:00
|
|
|
task::task().unlinked().future_result(|+r| {
|
2012-09-10 19:50:48 -05:00
|
|
|
result_future = Some(move r);
|
|
|
|
}).spawn(move testfn);
|
2012-10-22 21:01:37 -05:00
|
|
|
let task_result = option::unwrap(move result_future).recv();
|
2012-09-19 20:51:35 -05:00
|
|
|
let test_result = calc_result(&test, task_result == task::Success);
|
2012-12-13 16:18:47 -06:00
|
|
|
oldcomm::send(monitor_ch, (copy test, test_result));
|
2012-01-19 16:36:11 -06:00
|
|
|
};
|
2011-07-14 13:29:54 -05:00
|
|
|
}
|
|
|
|
|
2012-09-19 20:51:35 -05:00
|
|
|
fn calc_result(test: &TestDesc, task_succeeded: bool) -> TestResult {
|
2012-01-19 16:36:11 -06:00
|
|
|
if task_succeeded {
|
2012-09-04 20:05:57 -05:00
|
|
|
if test.should_fail { TrFailed }
|
|
|
|
else { TrOk }
|
2012-01-19 16:36:11 -06:00
|
|
|
} else {
|
2012-09-04 20:05:57 -05:00
|
|
|
if test.should_fail { TrOk }
|
|
|
|
else { TrFailed }
|
2012-01-19 16:36:11 -06:00
|
|
|
}
|
2011-07-15 00:24:19 -05:00
|
|
|
}
|
|
|
|
|
2012-01-17 21:05:07 -06:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2012-09-21 20:10:45 -05:00
|
|
|
#[legacy_exports];
|
2012-01-17 21:05:07 -06:00
|
|
|
|
2012-12-27 20:24:18 -06:00
|
|
|
use core::either;
|
|
|
|
use core::oldcomm;
|
|
|
|
use core::option;
|
|
|
|
use core::vec;
|
|
|
|
|
2012-01-17 21:05:07 -06:00
|
|
|
#[test]
|
|
|
|
fn do_not_run_ignored_tests() {
|
|
|
|
fn f() { fail; }
|
|
|
|
let desc = {
|
2012-07-14 00:57:48 -05:00
|
|
|
name: ~"whatever",
|
2012-09-12 16:51:38 -05:00
|
|
|
testfn: f,
|
2012-01-17 21:05:07 -06:00
|
|
|
ignore: true,
|
|
|
|
should_fail: false
|
|
|
|
};
|
2012-12-13 16:18:47 -06:00
|
|
|
let p = oldcomm::Port();
|
|
|
|
let ch = oldcomm::Chan(&p);
|
2012-01-19 16:36:11 -06:00
|
|
|
run_test(desc, ch);
|
2012-12-13 16:18:47 -06:00
|
|
|
let (_, res) = oldcomm::recv(p);
|
2012-09-04 20:05:57 -05:00
|
|
|
assert res != TrOk;
|
2012-01-17 21:05:07 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn ignored_tests_result_in_ignored() {
|
|
|
|
fn f() { }
|
|
|
|
let desc = {
|
2012-07-14 00:57:48 -05:00
|
|
|
name: ~"whatever",
|
2012-09-12 16:51:38 -05:00
|
|
|
testfn: f,
|
2012-01-17 21:05:07 -06:00
|
|
|
ignore: true,
|
|
|
|
should_fail: false
|
|
|
|
};
|
2012-12-13 16:18:47 -06:00
|
|
|
let p = oldcomm::Port();
|
|
|
|
let ch = oldcomm::Chan(&p);
|
2012-01-19 16:36:11 -06:00
|
|
|
run_test(desc, ch);
|
2012-12-13 16:18:47 -06:00
|
|
|
let (_, res) = oldcomm::recv(p);
|
2012-09-04 20:05:57 -05:00
|
|
|
assert res == TrIgnored;
|
2012-01-17 21:05:07 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2012-06-07 23:38:25 -05:00
|
|
|
#[ignore(cfg(windows))]
|
2012-01-17 21:05:07 -06:00
|
|
|
fn test_should_fail() {
|
|
|
|
fn f() { fail; }
|
|
|
|
let desc = {
|
2012-07-14 00:57:48 -05:00
|
|
|
name: ~"whatever",
|
2012-09-12 16:51:38 -05:00
|
|
|
testfn: f,
|
2012-01-17 21:05:07 -06:00
|
|
|
ignore: false,
|
|
|
|
should_fail: true
|
|
|
|
};
|
2012-12-13 16:18:47 -06:00
|
|
|
let p = oldcomm::Port();
|
|
|
|
let ch = oldcomm::Chan(&p);
|
2012-01-19 16:36:11 -06:00
|
|
|
run_test(desc, ch);
|
2012-12-13 16:18:47 -06:00
|
|
|
let (_, res) = oldcomm::recv(p);
|
2012-09-04 20:05:57 -05:00
|
|
|
assert res == TrOk;
|
2012-01-17 21:05:07 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_should_fail_but_succeeds() {
|
|
|
|
fn f() { }
|
|
|
|
let desc = {
|
2012-07-14 00:57:48 -05:00
|
|
|
name: ~"whatever",
|
2012-09-12 16:51:38 -05:00
|
|
|
testfn: f,
|
2012-01-17 21:05:07 -06:00
|
|
|
ignore: false,
|
|
|
|
should_fail: true
|
|
|
|
};
|
2012-12-13 16:18:47 -06:00
|
|
|
let p = oldcomm::Port();
|
|
|
|
let ch = oldcomm::Chan(&p);
|
2012-01-19 16:36:11 -06:00
|
|
|
run_test(desc, ch);
|
2012-12-13 16:18:47 -06:00
|
|
|
let (_, res) = oldcomm::recv(p);
|
2012-09-04 20:05:57 -05:00
|
|
|
assert res == TrFailed;
|
2012-01-17 21:05:07 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn first_free_arg_should_be_a_filter() {
|
2012-07-14 00:57:48 -05:00
|
|
|
let args = ~[~"progname", ~"filter"];
|
2012-08-06 14:34:08 -05:00
|
|
|
let opts = match parse_opts(args) {
|
2012-09-28 04:26:20 -05:00
|
|
|
either::Left(copy o) => o,
|
2012-08-03 21:59:04 -05:00
|
|
|
_ => fail ~"Malformed arg in first_free_arg_should_be_a_filter"
|
|
|
|
};
|
2012-09-21 21:37:57 -05:00
|
|
|
assert ~"filter" == opts.filter.get();
|
2012-01-17 21:05:07 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn parse_ignored_flag() {
|
2012-07-14 00:57:48 -05:00
|
|
|
let args = ~[~"progname", ~"filter", ~"--ignored"];
|
2012-08-06 14:34:08 -05:00
|
|
|
let opts = match parse_opts(args) {
|
2012-09-28 04:26:20 -05:00
|
|
|
either::Left(copy o) => o,
|
2012-08-03 21:59:04 -05:00
|
|
|
_ => fail ~"Malformed arg in parse_ignored_flag"
|
|
|
|
};
|
2012-01-17 21:05:07 -06:00
|
|
|
assert (opts.run_ignored);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn filter_for_ignored_option() {
|
|
|
|
// When we run ignored tests the test filter should filter out all the
|
|
|
|
// unignored tests and flip the ignore flag on the rest to false
|
|
|
|
|
2012-08-20 14:23:37 -05:00
|
|
|
let opts = {filter: option::None, run_ignored: true,
|
|
|
|
logfile: option::None};
|
2012-01-17 21:05:07 -06:00
|
|
|
let tests =
|
2012-09-12 16:51:38 -05:00
|
|
|
~[{name: ~"1", testfn: fn~() { },
|
|
|
|
ignore: true, should_fail: false},
|
|
|
|
{name: ~"2", testfn: fn~() { },
|
|
|
|
ignore: false, should_fail: false}];
|
2012-09-19 20:51:35 -05:00
|
|
|
let filtered = filter_tests(&opts, tests);
|
2012-01-17 21:05:07 -06:00
|
|
|
|
|
|
|
assert (vec::len(filtered) == 1u);
|
2012-07-14 00:57:48 -05:00
|
|
|
assert (filtered[0].name == ~"1");
|
2012-01-17 21:05:07 -06:00
|
|
|
assert (filtered[0].ignore == false);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn sort_tests() {
|
2012-08-20 14:23:37 -05:00
|
|
|
let opts = {filter: option::None, run_ignored: false,
|
|
|
|
logfile: option::None};
|
2012-01-17 21:05:07 -06:00
|
|
|
|
|
|
|
let names =
|
2012-07-14 00:57:48 -05:00
|
|
|
~[~"sha1::test", ~"int::test_to_str", ~"int::test_pow",
|
|
|
|
~"test::do_not_run_ignored_tests",
|
|
|
|
~"test::ignored_tests_result_in_ignored",
|
|
|
|
~"test::first_free_arg_should_be_a_filter",
|
|
|
|
~"test::parse_ignored_flag", ~"test::filter_for_ignored_option",
|
|
|
|
~"test::sort_tests"];
|
2012-01-17 21:05:07 -06:00
|
|
|
let tests =
|
|
|
|
{
|
2012-09-18 23:41:37 -05:00
|
|
|
let testfn = fn~() { };
|
|
|
|
let mut tests = ~[];
|
2012-09-18 23:41:13 -05:00
|
|
|
for vec::each(names) |name| {
|
2012-09-18 23:41:37 -05:00
|
|
|
let test = {name: *name, testfn: copy testfn, ignore: false,
|
|
|
|
should_fail: false};
|
2012-09-19 00:35:42 -05:00
|
|
|
tests.push(move test);
|
2012-09-18 23:41:37 -05:00
|
|
|
}
|
2012-09-19 00:35:42 -05:00
|
|
|
move tests
|
2012-09-18 23:41:37 -05:00
|
|
|
};
|
2012-09-19 20:51:35 -05:00
|
|
|
let filtered = filter_tests(&opts, tests);
|
2012-01-17 21:05:07 -06:00
|
|
|
|
2012-09-18 23:41:37 -05:00
|
|
|
let expected =
|
|
|
|
~[~"int::test_pow", ~"int::test_to_str", ~"sha1::test",
|
|
|
|
~"test::do_not_run_ignored_tests",
|
|
|
|
~"test::filter_for_ignored_option",
|
|
|
|
~"test::first_free_arg_should_be_a_filter",
|
|
|
|
~"test::ignored_tests_result_in_ignored",
|
|
|
|
~"test::parse_ignored_flag",
|
|
|
|
~"test::sort_tests"];
|
2012-01-17 21:05:07 -06:00
|
|
|
|
2012-09-19 00:35:42 -05:00
|
|
|
let pairs = vec::zip(expected, move filtered);
|
2012-01-17 21:05:07 -06:00
|
|
|
|
2012-09-18 23:41:37 -05:00
|
|
|
for vec::each(pairs) |p| {
|
|
|
|
match *p {
|
2012-09-28 04:26:20 -05:00
|
|
|
(ref a, ref b) => { assert (*a == b.name); }
|
2012-09-18 23:41:37 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-01-17 21:05:07 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-07-09 18:08:03 -05:00
|
|
|
// Local Variables:
|
|
|
|
// mode: rust;
|
|
|
|
// fill-column: 78;
|
|
|
|
// indent-tabs-mode: nil
|
|
|
|
// c-basic-offset: 4
|
|
|
|
// buffer-file-coding-system: utf-8-unix
|
|
|
|
// End:
|