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-09-18 11:20:57 -07:00
|
|
|
#[allow(non_camel_case_types)];
|
2013-06-30 19:36:55 -07:00
|
|
|
#[deny(warnings)];
|
2012-06-04 18:34:24 -07:00
|
|
|
|
2013-06-30 19:36:55 -07:00
|
|
|
extern mod extra;
|
2012-04-05 17:30:26 -07:00
|
|
|
|
2013-06-30 19:36:55 -07:00
|
|
|
use std::os;
|
2013-07-15 18:51:20 -07:00
|
|
|
use std::f64;
|
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
|
|
|
|
2013-05-24 19:35:29 -07:00
|
|
|
use extra::getopts;
|
2013-07-06 00:44:40 -07:00
|
|
|
use extra::getopts::groups::{optopt, optflag, reqopt};
|
2013-05-24 19:35:29 -07:00
|
|
|
use extra::test;
|
2012-11-18 17:56:50 -08:00
|
|
|
|
|
|
|
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;
|
2013-07-06 00:44:40 -07:00
|
|
|
use common::mode_codegen;
|
2012-11-18 17:56:50 -08:00
|
|
|
use common::mode;
|
|
|
|
use util::logv;
|
|
|
|
|
2013-03-26 19:53:33 -07:00
|
|
|
pub mod procsrv;
|
|
|
|
pub mod util;
|
|
|
|
pub mod header;
|
|
|
|
pub mod runtest;
|
|
|
|
pub mod common;
|
|
|
|
pub mod errors;
|
|
|
|
|
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);
|
2013-05-11 22:45:28 -04:00
|
|
|
log_config(&config);
|
|
|
|
run_tests(&config);
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn parse_config(args: ~[~str]) -> config {
|
2013-07-06 00:44:40 -07:00
|
|
|
|
|
|
|
let groups : ~[getopts::groups::OptGroup] =
|
|
|
|
~[reqopt("", "compile-lib-path", "path to host shared libraries", "PATH"),
|
|
|
|
reqopt("", "run-lib-path", "path to target shared libraries", "PATH"),
|
|
|
|
reqopt("", "rustc-path", "path to rustc to use for compiling", "PATH"),
|
|
|
|
optopt("", "clang-path", "path to executable for codegen tests", "PATH"),
|
|
|
|
optopt("", "llvm-bin-path", "path to directory holding llvm binaries", "DIR"),
|
|
|
|
reqopt("", "src-base", "directory to scan for test files", "PATH"),
|
|
|
|
reqopt("", "build-base", "directory to deposit test outputs", "PATH"),
|
|
|
|
reqopt("", "aux-base", "directory to find auxiliary test files", "PATH"),
|
|
|
|
reqopt("", "stage-id", "the target-stage identifier", "stageN-TARGET"),
|
|
|
|
reqopt("", "mode", "which sort of compile tests to run",
|
|
|
|
"(compile-fail|run-fail|run-pass|pretty|debug-info)"),
|
|
|
|
optflag("", "ignored", "run tests marked as ignored / xfailed"),
|
|
|
|
optopt("", "runtool", "supervisor program to run tests under \
|
|
|
|
(eg. emulator, valgrind)", "PROGRAM"),
|
|
|
|
optopt("", "rustcflags", "flags to pass to rustc", "FLAGS"),
|
|
|
|
optflag("", "verbose", "run tests verbosely, showing all output"),
|
|
|
|
optopt("", "logfile", "file to log test execution to", "FILE"),
|
2013-07-15 18:51:20 -07:00
|
|
|
optopt("", "save-metrics", "file to save metrics to", "FILE"),
|
|
|
|
optopt("", "ratchet-metrics", "file to ratchet metrics against", "FILE"),
|
|
|
|
optopt("", "ratchet-noise-percent",
|
|
|
|
"percent change in metrics to consider noise", "N"),
|
2013-07-06 00:44:40 -07:00
|
|
|
optflag("", "jit", "run tests under the JIT"),
|
|
|
|
optflag("", "newrt", "run tests on the new runtime / scheduler"),
|
|
|
|
optopt("", "target", "the target to build for", "TARGET"),
|
|
|
|
optopt("", "adb-path", "path to the android debugger", "PATH"),
|
|
|
|
optopt("", "adb-test-dir", "path to tests for the android debugger", "PATH"),
|
|
|
|
optflag("h", "help", "show this message"),
|
2013-05-01 18:52:08 +09:00
|
|
|
];
|
2012-11-18 17:56:50 -08:00
|
|
|
|
2013-03-28 18:39:09 -07:00
|
|
|
assert!(!args.is_empty());
|
2013-07-12 21:05:59 -07:00
|
|
|
let argv0 = args[0].clone();
|
2013-06-27 22:36:27 +10:00
|
|
|
let args_ = args.tail();
|
2013-07-06 00:44:40 -07:00
|
|
|
if args[1] == ~"-h" || args[1] == ~"--help" {
|
|
|
|
let message = fmt!("Usage: %s [OPTIONS] [TESTNAME...]", argv0);
|
2013-07-11 15:16:11 -07:00
|
|
|
println(getopts::groups::usage(message, groups));
|
2013-07-30 18:35:45 +02:00
|
|
|
println("");
|
2013-07-06 00:44:40 -07:00
|
|
|
fail!()
|
|
|
|
}
|
|
|
|
|
2012-11-18 17:56:50 -08:00
|
|
|
let matches =
|
2013-07-06 00:44:40 -07:00
|
|
|
&match getopts::groups::getopts(args_, groups) {
|
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
|
|
|
};
|
|
|
|
|
2013-07-06 00:44:40 -07:00
|
|
|
if getopts::opt_present(matches, "h") || getopts::opt_present(matches, "help") {
|
|
|
|
let message = fmt!("Usage: %s [OPTIONS] [TESTNAME...]", argv0);
|
2013-07-11 15:16:11 -07:00
|
|
|
println(getopts::groups::usage(message, groups));
|
2013-07-30 18:35:45 +02:00
|
|
|
println("");
|
2013-07-06 00:44:40 -07:00
|
|
|
fail!()
|
|
|
|
}
|
|
|
|
|
2013-05-23 09:39:48 -07: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 {
|
2013-05-23 09:39:48 -07:00
|
|
|
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"),
|
2013-07-06 00:44:40 -07:00
|
|
|
clang_path: getopts::opt_maybe_str(matches, "clang-path").map(|s| Path(*s)),
|
|
|
|
llvm_bin_path: getopts::opt_maybe_str(matches, "llvm-bin-path").map(|s| Path(*s)),
|
2013-05-23 09:39:48 -07:00
|
|
|
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"),
|
2013-02-21 15:19:40 -08:00
|
|
|
filter:
|
2013-07-02 12:47:32 -07:00
|
|
|
if !matches.free.is_empty() {
|
|
|
|
Some(matches.free[0].clone())
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
},
|
2013-05-23 09:39:48 -07:00
|
|
|
logfile: getopts::opt_maybe_str(matches, "logfile").map(|s| Path(*s)),
|
2013-07-15 18:51:20 -07:00
|
|
|
save_metrics: getopts::opt_maybe_str(matches, "save-metrics").map(|s| Path(*s)),
|
|
|
|
ratchet_metrics:
|
|
|
|
getopts::opt_maybe_str(matches, "ratchet-metrics").map(|s| Path(*s)),
|
|
|
|
ratchet_noise_percent:
|
|
|
|
getopts::opt_maybe_str(matches,
|
|
|
|
"ratchet-noise-percent").map(|s|
|
2013-08-04 01:59:24 +02:00
|
|
|
f64::from_str(*s).unwrap()),
|
2013-05-23 09:39:48 -07:00
|
|
|
runtool: getopts::opt_maybe_str(matches, "runtool"),
|
|
|
|
rustcflags: getopts::opt_maybe_str(matches, "rustcflags"),
|
|
|
|
jit: getopts::opt_present(matches, "jit"),
|
|
|
|
newrt: getopts::opt_present(matches, "newrt"),
|
|
|
|
target: opt_str2(getopts::opt_maybe_str(matches, "target")).to_str(),
|
|
|
|
adb_path: opt_str2(getopts::opt_maybe_str(matches, "adb-path")).to_str(),
|
2013-05-11 22:45:28 -04:00
|
|
|
adb_test_dir:
|
2013-05-23 09:39:48 -07:00
|
|
|
opt_str2(getopts::opt_maybe_str(matches, "adb-test-dir")).to_str(),
|
2013-05-04 10:35:07 +09:00
|
|
|
adb_device_status:
|
2013-05-23 09:39:48 -07:00
|
|
|
if (opt_str2(getopts::opt_maybe_str(matches, "target")) ==
|
2013-05-04 10:35:07 +09:00
|
|
|
~"arm-linux-androideabi") {
|
2013-05-23 09:39:48 -07:00
|
|
|
if (opt_str2(getopts::opt_maybe_str(matches, "adb-test-dir")) !=
|
2013-05-04 10:35:07 +09:00
|
|
|
~"(none)" &&
|
2013-05-23 09:39:48 -07:00
|
|
|
opt_str2(getopts::opt_maybe_str(matches, "adb-test-dir")) !=
|
2013-05-04 10:35:07 +09:00
|
|
|
~"") { true }
|
|
|
|
else { false }
|
|
|
|
} else { false },
|
2013-05-23 09:39:48 -07:00
|
|
|
verbose: getopts::opt_present(matches, "verbose")
|
2013-02-21 15:19:40 -08:00
|
|
|
}
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
2013-05-11 22:45:28 -04: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));
|
2013-05-11 22:45:28 -04:00
|
|
|
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)));
|
2012-11-18 17:56:50 -08:00
|
|
|
logv(c, fmt!("jit: %b", config.jit));
|
2013-03-15 18:06:19 -07:00
|
|
|
logv(c, fmt!("newrt: %b", config.newrt));
|
2013-05-01 18:52:08 +09:00
|
|
|
logv(c, fmt!("target: %s", config.target));
|
|
|
|
logv(c, fmt!("adb_path: %s", config.adb_path));
|
2013-05-02 13:16:01 +09:00
|
|
|
logv(c, fmt!("adb_test_dir: %s", config.adb_test_dir));
|
2013-05-04 10:35:07 +09:00
|
|
|
logv(c, fmt!("adb_device_status: %b", config.adb_device_status));
|
2012-11-18 17:56:50 -08:00
|
|
|
logv(c, fmt!("verbose: %b", config.verbose));
|
|
|
|
logv(c, fmt!("\n"));
|
|
|
|
}
|
|
|
|
|
2013-05-11 22:45:28 -04:00
|
|
|
pub fn opt_str<'a>(maybestr: &'a Option<~str>) -> &'a str {
|
|
|
|
match *maybestr {
|
2013-06-30 19:36:55 -07:00
|
|
|
None => "(none)",
|
|
|
|
Some(ref s) => {
|
2013-05-11 22:45:28 -04:00
|
|
|
let s: &'a str = *s;
|
|
|
|
s
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn opt_str2(maybestr: Option<~str>) -> ~str {
|
|
|
|
match maybestr { None => ~"(none)", Some(s) => { s } }
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
2013-01-30 14:10:03 -08:00
|
|
|
pub fn str_opt(maybestr: ~str) -> Option<~str> {
|
2013-06-30 19:36:55 -07:00
|
|
|
if maybestr != ~"(none)" { Some(maybestr) } else { None }
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
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-07-06 00:44:40 -07:00
|
|
|
~"codegen" => mode_codegen,
|
2013-05-06 00:18:51 +02: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",
|
2013-07-06 00:44:40 -07:00
|
|
|
mode_codegen => ~"codegen",
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-11 22:45:28 -04: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-05-06 00:18:51 +02:00
|
|
|
if !res { fail!("Some tests failed"); }
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
2013-05-11 22:45:28 -04:00
|
|
|
pub fn test_opts(config: &config) -> test::TestOpts {
|
2013-01-22 08:44:24 -08:00
|
|
|
test::TestOpts {
|
2013-07-02 12:47:32 -07:00
|
|
|
filter: config.filter.clone(),
|
2013-01-22 08:44:24 -08:00
|
|
|
run_ignored: config.run_ignored,
|
2013-07-02 12:47:32 -07:00
|
|
|
logfile: config.logfile.clone(),
|
2013-02-13 11:46:14 -08:00
|
|
|
run_tests: true,
|
2013-07-15 18:51:20 -07:00
|
|
|
run_benchmarks: true,
|
2013-07-17 18:03:48 -07:00
|
|
|
ratchet_metrics: config.ratchet_metrics.clone(),
|
|
|
|
ratchet_noise_percent: config.ratchet_noise_percent.clone(),
|
|
|
|
save_metrics: config.save_metrics.clone(),
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-11 22:45:28 -04: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 = ~[];
|
2013-06-21 08:29:53 -04:00
|
|
|
let dirs = os::list_dir_path(&config.src_base);
|
2013-08-03 12:45:23 -04:00
|
|
|
for file in dirs.iter() {
|
2013-07-21 18:33:29 +01:00
|
|
|
let file = file.clone();
|
2012-11-18 17:56:50 -08:00
|
|
|
debug!("inspecting file %s", file.to_str());
|
2013-07-21 18:33:29 +01:00
|
|
|
if is_test(config, &file) {
|
|
|
|
let t = do make_test(config, &file) {
|
2013-07-15 18:51:20 -07:00
|
|
|
match config.mode {
|
2013-07-21 18:33:29 +01:00
|
|
|
mode_codegen => make_metrics_test_closure(config, &file),
|
|
|
|
_ => make_test_closure(config, &file)
|
2013-07-15 18:51:20 -07:00
|
|
|
}
|
|
|
|
};
|
|
|
|
tests.push(t)
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
}
|
2013-02-15 01:11:38 -08:00
|
|
|
tests
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
2013-05-11 22:45:28 -04: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 = ~[~".", ~"#", ~"~"];
|
2013-08-04 01:59:24 +02:00
|
|
|
let name = testfile.filename().unwrap();
|
2012-11-18 17:56:50 -08:00
|
|
|
|
|
|
|
let mut valid = false;
|
|
|
|
|
2013-08-03 12:45:23 -04:00
|
|
|
for ext in valid_extensions.iter() {
|
2013-06-11 01:03:16 +10:00
|
|
|
if name.ends_with(*ext) { valid = true; }
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
2013-08-03 12:45:23 -04:00
|
|
|
for pre in invalid_prefixes.iter() {
|
2013-06-11 01:03:16 +10:00
|
|
|
if name.starts_with(*pre) { valid = false; }
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
return valid;
|
|
|
|
}
|
|
|
|
|
2013-07-15 18:51:20 -07:00
|
|
|
pub fn make_test(config: &config, testfile: &Path,
|
|
|
|
f: &fn()->test::TestFn) -> test::TestDescAndFn {
|
2013-01-31 17:12:29 -08:00
|
|
|
test::TestDescAndFn {
|
|
|
|
desc: test::TestDesc {
|
|
|
|
name: make_test_name(config, testfile),
|
|
|
|
ignore: header::is_test_ignored(config, testfile),
|
|
|
|
should_fail: false
|
|
|
|
},
|
2013-07-15 18:51:20 -07:00
|
|
|
testfn: f(),
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-11 22:45:28 -04:00
|
|
|
pub fn make_test_name(config: &config, testfile: &Path) -> test::TestName {
|
2013-06-23 01:27:34 -07:00
|
|
|
|
|
|
|
// Try to elide redundant long paths
|
|
|
|
fn shorten(path: &Path) -> ~str {
|
|
|
|
let filename = path.filename();
|
|
|
|
let dir = path.pop().filename();
|
2013-08-04 01:59:24 +02:00
|
|
|
fmt!("%s/%s", dir.unwrap_or_default(~""), filename.unwrap_or_default(~""))
|
2013-06-23 01:27:34 -07:00
|
|
|
}
|
2013-06-26 15:34:12 -07:00
|
|
|
|
2013-02-13 11:46:14 -08:00
|
|
|
test::DynTestName(fmt!("[%s] %s",
|
|
|
|
mode_str(config.mode),
|
2013-06-23 01:27:34 -07:00
|
|
|
shorten(testfile)))
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
|
|
|
|
2013-05-11 22:45:28 -04:00
|
|
|
pub fn make_test_closure(config: &config, testfile: &Path) -> test::TestFn {
|
2013-06-30 19:36:55 -07:00
|
|
|
use std::cell::Cell;
|
2013-07-02 12:47:32 -07:00
|
|
|
let config = Cell::new((*config).clone());
|
2013-06-04 12:03:58 +02:00
|
|
|
let testfile = Cell::new(testfile.to_str());
|
2013-05-11 22:45:28 -04:00
|
|
|
test::DynTestFn(|| { runtest::run(config.take(), testfile.take()) })
|
2012-11-18 17:56:50 -08:00
|
|
|
}
|
2013-07-15 18:51:20 -07:00
|
|
|
|
|
|
|
pub fn make_metrics_test_closure(config: &config, testfile: &Path) -> test::TestFn {
|
|
|
|
use std::cell::Cell;
|
2013-07-17 18:03:48 -07:00
|
|
|
let config = Cell::new((*config).clone());
|
2013-07-15 18:51:20 -07:00
|
|
|
let testfile = Cell::new(testfile.to_str());
|
|
|
|
test::DynMetricFn(|mm| { runtest::run_metrics(config.take(), testfile.take(), mm) })
|
|
|
|
}
|