2012-12-03 16:48:01 -08: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-01-17 14:40:59 -08:00
|
|
|
#[crate_type = "bin"];
|
|
|
|
|
2012-04-05 17:30:26 -07:00
|
|
|
#[no_core];
|
|
|
|
|
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 17:08:21 -07:00
|
|
|
#[allow(vecs_implicitly_copyable)];
|
2012-09-18 11:20:57 -07:00
|
|
|
#[allow(non_camel_case_types)];
|
2012-09-28 18:38:59 -07:00
|
|
|
#[allow(deprecated_mode)];
|
|
|
|
#[allow(deprecated_pattern)];
|
2012-06-04 18:34:24 -07:00
|
|
|
|
2012-12-21 15:35:15 -08:00
|
|
|
extern mod core(vers = "0.6");
|
|
|
|
extern mod std(vers = "0.6");
|
2012-04-05 17:30:26 -07:00
|
|
|
|
2012-09-07 18:08:21 -07:00
|
|
|
use core::*;
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 19:01:09 -07:00
|
|
|
|
2011-07-30 21:11:14 -07:00
|
|
|
mod procsrv;
|
|
|
|
mod util;
|
|
|
|
mod header;
|
|
|
|
mod runtest;
|
|
|
|
mod common;
|
2012-01-03 21:01:48 -08:00
|
|
|
mod errors;
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 19:01:09 -07:00
|
|
|
|
2012-11-18 17:56:50 -08:00
|
|
|
use std::getopts;
|
|
|
|
use std::test;
|
|
|
|
|
2013-02-13 11:46:14 -08:00
|
|
|
use core::{result, either};
|
2012-11-18 17:56:50 -08:00
|
|
|
use result::{Ok, Err};
|
|
|
|
|
|
|
|
use common::config;
|
|
|
|
use common::mode_run_pass;
|
|
|
|
use common::mode_run_fail;
|
|
|
|
use common::mode_compile_fail;
|
|
|
|
use common::mode_pretty;
|
2013-02-09 13:09:19 -05:00
|
|
|
use common::mode_debug_info;
|
2012-11-18 17:56:50 -08:00
|
|
|
use common::mode;
|
|
|
|
use util::logv;
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn main() {
|
2012-11-18 17:56:50 -08:00
|
|
|
let args = os::args();
|
|
|
|
let config = parse_config(args);
|
|
|
|
log_config(config);
|
|
|
|
run_tests(config);
|
|
|
|
}
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn parse_config(args: ~[~str]) -> config {
|
2012-11-18 17:56:50 -08:00
|
|
|
let opts =
|
|
|
|
~[getopts::reqopt(~"compile-lib-path"),
|
|
|
|
getopts::reqopt(~"run-lib-path"),
|
|
|
|
getopts::reqopt(~"rustc-path"), getopts::reqopt(~"src-base"),
|
|
|
|
getopts::reqopt(~"build-base"), getopts::reqopt(~"aux-base"),
|
|
|
|
getopts::reqopt(~"stage-id"),
|
|
|
|
getopts::reqopt(~"mode"), getopts::optflag(~"ignored"),
|
|
|
|
getopts::optopt(~"runtool"), getopts::optopt(~"rustcflags"),
|
|
|
|
getopts::optflag(~"verbose"),
|
|
|
|
getopts::optopt(~"logfile"),
|
|
|
|
getopts::optflag(~"jit")];
|
|
|
|
|
2013-01-24 23:24:57 -05:00
|
|
|
assert !args.is_empty();
|
2012-11-18 17:56:50 -08:00
|
|
|
let args_ = vec::tail(args);
|
|
|
|
let matches =
|
2012-11-28 12:38:53 -08:00
|
|
|
&match getopts::getopts(args_, opts) {
|
2012-11-18 17:56:50 -08:00
|
|
|
Ok(m) => m,
|
2013-02-11 19:26:38 -08:00
|
|
|
Err(f) => fail!(getopts::fail_str(f))
|
2012-11-18 17:56:50 -08:00
|
|
|
};
|
|
|
|
|
2012-11-28 12:38:53 -08:00
|
|
|
fn opt_path(m: &getopts::Matches, nm: ~str) -> Path {
|
2012-11-18 17:56:50 -08:00
|
|
|
Path(getopts::opt_str(m, nm))
|
|
|
|
}
|
|
|
|
|
2013-02-21 15:19:40 -08:00
|
|
|
config {
|
|
|
|
compile_lib_path: getopts::opt_str(matches, ~"compile-lib-path"),
|
|
|
|
run_lib_path: getopts::opt_str(matches, ~"run-lib-path"),
|
|
|
|
rustc_path: opt_path(matches, ~"rustc-path"),
|
|
|
|
src_base: opt_path(matches, ~"src-base"),
|
|
|
|
build_base: opt_path(matches, ~"build-base"),
|
|
|
|
aux_base: opt_path(matches, ~"aux-base"),
|
|
|
|
stage_id: getopts::opt_str(matches, ~"stage-id"),
|
|
|
|
mode: str_mode(getopts::opt_str(matches, ~"mode")),
|
|
|
|
run_ignored: getopts::opt_present(matches, ~"ignored"),
|
|
|
|
filter:
|
2012-11-18 17:56:50 -08:00
|
|
|
if vec::len(matches.free) > 0u {
|
|
|
|
option::Some(matches.free[0])
|
|
|
|
} else { option::None },
|
2013-02-21 15:19:40 -08:00
|
|
|
logfile: option::map(&getopts::opt_maybe_str(matches,
|
2012-11-18 17:56:50 -08:00
|
|
|
~"logfile"),
|
2013-02-21 15:19:40 -08:00
|
|
|
|s| Path(*s)),
|
|
|
|
runtool: getopts::opt_maybe_str(matches, ~"runtool"),
|
|
|
|
rustcflags: getopts::opt_maybe_str(matches, ~"rustcflags"),
|
|
|
|
jit: getopts::opt_present(matches, ~"jit"),
|
|
|
|
verbose: getopts::opt_present(matches, ~"verbose")
|
|
|
|
}
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn log_config(config: config) {
|
2012-11-18 17:56:50 -08:00
|
|
|
let c = config;
|
|
|
|
logv(c, fmt!("configuration:"));
|
|
|
|
logv(c, fmt!("compile_lib_path: %s", config.compile_lib_path));
|
|
|
|
logv(c, fmt!("run_lib_path: %s", config.run_lib_path));
|
|
|
|
logv(c, fmt!("rustc_path: %s", config.rustc_path.to_str()));
|
|
|
|
logv(c, fmt!("src_base: %s", config.src_base.to_str()));
|
|
|
|
logv(c, fmt!("build_base: %s", config.build_base.to_str()));
|
|
|
|
logv(c, fmt!("stage_id: %s", config.stage_id));
|
|
|
|
logv(c, fmt!("mode: %s", mode_str(config.mode)));
|
|
|
|
logv(c, fmt!("run_ignored: %b", config.run_ignored));
|
|
|
|
logv(c, fmt!("filter: %s", opt_str(config.filter)));
|
|
|
|
logv(c, fmt!("runtool: %s", opt_str(config.runtool)));
|
|
|
|
logv(c, fmt!("rustcflags: %s", opt_str(config.rustcflags)));
|
|
|
|
logv(c, fmt!("jit: %b", config.jit));
|
|
|
|
logv(c, fmt!("verbose: %b", config.verbose));
|
|
|
|
logv(c, fmt!("\n"));
|
|
|
|
}
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn opt_str(maybestr: Option<~str>) -> ~str {
|
2012-11-18 17:56:50 -08:00
|
|
|
match maybestr { option::Some(s) => s, option::None => ~"(none)" }
|
|
|
|
}
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn str_opt(maybestr: ~str) -> Option<~str> {
|
2012-11-18 17:56:50 -08:00
|
|
|
if maybestr != ~"(none)" { option::Some(maybestr) } else { option::None }
|
|
|
|
}
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn str_mode(s: ~str) -> mode {
|
2012-11-18 17:56:50 -08:00
|
|
|
match s {
|
|
|
|
~"compile-fail" => mode_compile_fail,
|
|
|
|
~"run-fail" => mode_run_fail,
|
|
|
|
~"run-pass" => mode_run_pass,
|
|
|
|
~"pretty" => mode_pretty,
|
2013-02-09 13:09:19 -05:00
|
|
|
~"debug-info" => mode_debug_info,
|
2013-02-11 19:26:38 -08:00
|
|
|
_ => fail!(~"invalid mode")
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn mode_str(mode: mode) -> ~str {
|
2012-11-18 17:56:50 -08:00
|
|
|
match mode {
|
|
|
|
mode_compile_fail => ~"compile-fail",
|
|
|
|
mode_run_fail => ~"run-fail",
|
|
|
|
mode_run_pass => ~"run-pass",
|
2013-02-09 13:09:19 -05:00
|
|
|
mode_pretty => ~"pretty",
|
|
|
|
mode_debug_info => ~"debug-info",
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn run_tests(config: config) {
|
2012-11-18 17:56:50 -08:00
|
|
|
let opts = test_opts(config);
|
|
|
|
let tests = make_tests(config);
|
|
|
|
let res = test::run_tests_console(&opts, tests);
|
2013-02-11 19:26:38 -08:00
|
|
|
if !res { fail!(~"Some tests failed"); }
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn test_opts(config: config) -> test::TestOpts {
|
2013-01-22 08:44:24 -08:00
|
|
|
test::TestOpts {
|
|
|
|
filter: config.filter,
|
|
|
|
run_ignored: config.run_ignored,
|
2013-02-13 11:46:14 -08:00
|
|
|
logfile: copy config.logfile,
|
|
|
|
run_tests: true,
|
|
|
|
run_benchmarks: false,
|
|
|
|
save_results: option::None,
|
|
|
|
compare_results: option::None
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-31 17:12:29 -08:00
|
|
|
pub fn make_tests(config: config) -> ~[test::TestDescAndFn] {
|
2012-11-18 17:56:50 -08:00
|
|
|
debug!("making tests from %s",
|
|
|
|
config.src_base.to_str());
|
|
|
|
let mut tests = ~[];
|
|
|
|
for os::list_dir_path(&config.src_base).each |file| {
|
|
|
|
let file = copy *file;
|
|
|
|
debug!("inspecting file %s", file.to_str());
|
|
|
|
if is_test(config, file) {
|
|
|
|
tests.push(make_test(config, file))
|
|
|
|
}
|
|
|
|
}
|
2013-02-15 01:11:38 -08:00
|
|
|
tests
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn is_test(config: config, testfile: &Path) -> bool {
|
2012-11-18 17:56:50 -08:00
|
|
|
// Pretty-printer does not work with .rc files yet
|
|
|
|
let valid_extensions =
|
|
|
|
match config.mode {
|
|
|
|
mode_pretty => ~[~".rs"],
|
|
|
|
_ => ~[~".rc", ~".rs"]
|
|
|
|
};
|
|
|
|
let invalid_prefixes = ~[~".", ~"#", ~"~"];
|
|
|
|
let name = testfile.filename().get();
|
|
|
|
|
|
|
|
let mut valid = false;
|
|
|
|
|
|
|
|
for valid_extensions.each |ext| {
|
|
|
|
if str::ends_with(name, *ext) { valid = true; }
|
|
|
|
}
|
|
|
|
|
|
|
|
for invalid_prefixes.each |pre| {
|
|
|
|
if str::starts_with(name, *pre) { valid = false; }
|
|
|
|
}
|
|
|
|
|
|
|
|
return valid;
|
|
|
|
}
|
|
|
|
|
2013-01-31 17:12:29 -08:00
|
|
|
pub fn make_test(config: config, testfile: &Path) -> test::TestDescAndFn {
|
|
|
|
test::TestDescAndFn {
|
|
|
|
desc: test::TestDesc {
|
|
|
|
name: make_test_name(config, testfile),
|
|
|
|
ignore: header::is_test_ignored(config, testfile),
|
|
|
|
should_fail: false
|
|
|
|
},
|
2012-11-18 17:56:50 -08:00
|
|
|
testfn: make_test_closure(config, testfile),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-02-13 11:46:14 -08:00
|
|
|
pub fn make_test_name(config: config, testfile: &Path) -> test::TestName {
|
|
|
|
test::DynTestName(fmt!("[%s] %s",
|
|
|
|
mode_str(config.mode),
|
|
|
|
testfile.to_str()))
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn make_test_closure(config: config, testfile: &Path) -> test::TestFn {
|
2012-11-18 17:56:50 -08:00
|
|
|
let testfile = testfile.to_str();
|
2013-02-13 11:46:14 -08:00
|
|
|
test::DynTestFn(fn~() { runtest::run(config, testfile) })
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 19:01:09 -07:00
|
|
|
// Local Variables:
|
|
|
|
// fill-column: 78;
|
|
|
|
// indent-tabs-mode: nil
|
|
|
|
// c-basic-offset: 4
|
|
|
|
// buffer-file-coding-system: utf-8-unix
|
|
|
|
// End:
|