use methods for EarlyProps and TestProps
This commit is contained in:
Niko Matsakis
parent
514b37e3d6
commit
ef884bcb93
@ -18,181 +18,15 @@ use common::Config;
|
||||
use common;
|
||||
use util;
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct TestProps {
|
||||
// Lines that should be expected, in order, on standard out
|
||||
pub error_patterns: Vec<String> ,
|
||||
// Extra flags to pass to the compiler
|
||||
pub compile_flags: Vec<String>,
|
||||
// Extra flags to pass when the compiled code is run (such as --bench)
|
||||
pub run_flags: Option<String>,
|
||||
// If present, the name of a file that this test should match when
|
||||
// pretty-printed
|
||||
pub pp_exact: Option<PathBuf>,
|
||||
// Modules from aux directory that should be compiled
|
||||
pub aux_builds: Vec<String> ,
|
||||
// Environment settings to use for compiling
|
||||
pub rustc_env: Vec<(String,String)> ,
|
||||
// Environment settings to use during execution
|
||||
pub exec_env: Vec<(String,String)> ,
|
||||
// Lines to check if they appear in the expected debugger output
|
||||
pub check_lines: Vec<String> ,
|
||||
// Build documentation for all specified aux-builds as well
|
||||
pub build_aux_docs: bool,
|
||||
// Flag to force a crate to be built with the host architecture
|
||||
pub force_host: bool,
|
||||
// Check stdout for error-pattern output as well as stderr
|
||||
pub check_stdout: bool,
|
||||
// Don't force a --crate-type=dylib flag on the command line
|
||||
pub no_prefer_dynamic: bool,
|
||||
// Run --pretty expanded when running pretty printing tests
|
||||
pub pretty_expanded: bool,
|
||||
// Which pretty mode are we testing with, default to 'normal'
|
||||
pub pretty_mode: String,
|
||||
// Only compare pretty output and don't try compiling
|
||||
pub pretty_compare_only: bool,
|
||||
// Patterns which must not appear in the output of a cfail test.
|
||||
pub forbid_output: Vec<String>,
|
||||
// Revisions to test for incremental compilation.
|
||||
pub revisions: Vec<String>,
|
||||
}
|
||||
|
||||
// Load any test directives embedded in the file
|
||||
pub fn load_props(testfile: &Path) -> TestProps {
|
||||
let error_patterns = Vec::new();
|
||||
let aux_builds = Vec::new();
|
||||
let exec_env = Vec::new();
|
||||
let run_flags = None;
|
||||
let pp_exact = None;
|
||||
let check_lines = Vec::new();
|
||||
let build_aux_docs = false;
|
||||
let force_host = false;
|
||||
let check_stdout = false;
|
||||
let no_prefer_dynamic = false;
|
||||
let pretty_expanded = false;
|
||||
let pretty_compare_only = false;
|
||||
let forbid_output = Vec::new();
|
||||
let mut props = TestProps {
|
||||
error_patterns: error_patterns,
|
||||
compile_flags: vec![],
|
||||
run_flags: run_flags,
|
||||
pp_exact: pp_exact,
|
||||
aux_builds: aux_builds,
|
||||
revisions: vec![],
|
||||
rustc_env: vec![],
|
||||
exec_env: exec_env,
|
||||
check_lines: check_lines,
|
||||
build_aux_docs: build_aux_docs,
|
||||
force_host: force_host,
|
||||
check_stdout: check_stdout,
|
||||
no_prefer_dynamic: no_prefer_dynamic,
|
||||
pretty_expanded: pretty_expanded,
|
||||
pretty_mode: format!("normal"),
|
||||
pretty_compare_only: pretty_compare_only,
|
||||
forbid_output: forbid_output,
|
||||
};
|
||||
load_props_into(&mut props, testfile, None);
|
||||
props
|
||||
}
|
||||
|
||||
/// Load properties from `testfile` into `props`. If a property is
|
||||
/// tied to a particular revision `foo` (indicated by writing
|
||||
/// `//[foo]`), then the property is ignored unless `cfg` is
|
||||
/// `Some("foo")`.
|
||||
pub fn load_props_into(props: &mut TestProps, testfile: &Path, cfg: Option<&str>) {
|
||||
iter_header(testfile, cfg, &mut |ln| {
|
||||
if let Some(ep) = parse_error_pattern(ln) {
|
||||
props.error_patterns.push(ep);
|
||||
}
|
||||
|
||||
if let Some(flags) = parse_compile_flags(ln) {
|
||||
props.compile_flags.extend(
|
||||
flags
|
||||
.split_whitespace()
|
||||
.map(|s| s.to_owned()));
|
||||
}
|
||||
|
||||
if let Some(r) = parse_revisions(ln) {
|
||||
props.revisions.extend(r);
|
||||
}
|
||||
|
||||
if props.run_flags.is_none() {
|
||||
props.run_flags = parse_run_flags(ln);
|
||||
}
|
||||
|
||||
if props.pp_exact.is_none() {
|
||||
props.pp_exact = parse_pp_exact(ln, testfile);
|
||||
}
|
||||
|
||||
if !props.build_aux_docs {
|
||||
props.build_aux_docs = parse_build_aux_docs(ln);
|
||||
}
|
||||
|
||||
if !props.force_host {
|
||||
props.force_host = parse_force_host(ln);
|
||||
}
|
||||
|
||||
if !props.check_stdout {
|
||||
props.check_stdout = parse_check_stdout(ln);
|
||||
}
|
||||
|
||||
if !props.no_prefer_dynamic {
|
||||
props.no_prefer_dynamic = parse_no_prefer_dynamic(ln);
|
||||
}
|
||||
|
||||
if !props.pretty_expanded {
|
||||
props.pretty_expanded = parse_pretty_expanded(ln);
|
||||
}
|
||||
|
||||
if let Some(m) = parse_pretty_mode(ln) {
|
||||
props.pretty_mode = m;
|
||||
}
|
||||
|
||||
if !props.pretty_compare_only {
|
||||
props.pretty_compare_only = parse_pretty_compare_only(ln);
|
||||
}
|
||||
|
||||
if let Some(ab) = parse_aux_build(ln) {
|
||||
props.aux_builds.push(ab);
|
||||
}
|
||||
|
||||
if let Some(ee) = parse_env(ln, "exec-env") {
|
||||
props.exec_env.push(ee);
|
||||
}
|
||||
|
||||
if let Some(ee) = parse_env(ln, "rustc-env") {
|
||||
props.rustc_env.push(ee);
|
||||
}
|
||||
|
||||
if let Some(cl) = parse_check_line(ln) {
|
||||
props.check_lines.push(cl);
|
||||
}
|
||||
|
||||
if let Some(of) = parse_forbid_output(ln) {
|
||||
props.forbid_output.push(of);
|
||||
}
|
||||
});
|
||||
|
||||
for key in vec!["RUST_TEST_NOCAPTURE", "RUST_TEST_THREADS"] {
|
||||
match env::var(key) {
|
||||
Ok(val) =>
|
||||
if props.exec_env.iter().find(|&&(ref x, _)| *x == key).is_none() {
|
||||
props.exec_env.push((key.to_owned(), val))
|
||||
},
|
||||
Err(..) => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Properties which must be known very early, before actually running
|
||||
/// the test.
|
||||
pub struct EarlyProps {
|
||||
pub ignore: bool,
|
||||
pub should_fail: bool,
|
||||
}
|
||||
|
||||
// scan the file to detect whether the test should be ignored and
|
||||
// whether it should panic; these are two things the test runner needs
|
||||
// to know early, before actually running the test
|
||||
pub fn early_props(config: &Config, testfile: &Path) -> EarlyProps {
|
||||
impl EarlyProps {
|
||||
pub fn from_file(config: &Config, testfile: &Path) -> Self {
|
||||
let mut props = EarlyProps {
|
||||
ignore: false,
|
||||
should_fail: false,
|
||||
@ -287,6 +121,178 @@ pub fn early_props(config: &Config, testfile: &Path) -> EarlyProps {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct TestProps {
|
||||
// Lines that should be expected, in order, on standard out
|
||||
pub error_patterns: Vec<String> ,
|
||||
// Extra flags to pass to the compiler
|
||||
pub compile_flags: Vec<String>,
|
||||
// Extra flags to pass when the compiled code is run (such as --bench)
|
||||
pub run_flags: Option<String>,
|
||||
// If present, the name of a file that this test should match when
|
||||
// pretty-printed
|
||||
pub pp_exact: Option<PathBuf>,
|
||||
// Modules from aux directory that should be compiled
|
||||
pub aux_builds: Vec<String> ,
|
||||
// Environment settings to use for compiling
|
||||
pub rustc_env: Vec<(String,String)> ,
|
||||
// Environment settings to use during execution
|
||||
pub exec_env: Vec<(String,String)> ,
|
||||
// Lines to check if they appear in the expected debugger output
|
||||
pub check_lines: Vec<String> ,
|
||||
// Build documentation for all specified aux-builds as well
|
||||
pub build_aux_docs: bool,
|
||||
// Flag to force a crate to be built with the host architecture
|
||||
pub force_host: bool,
|
||||
// Check stdout for error-pattern output as well as stderr
|
||||
pub check_stdout: bool,
|
||||
// Don't force a --crate-type=dylib flag on the command line
|
||||
pub no_prefer_dynamic: bool,
|
||||
// Run --pretty expanded when running pretty printing tests
|
||||
pub pretty_expanded: bool,
|
||||
// Which pretty mode are we testing with, default to 'normal'
|
||||
pub pretty_mode: String,
|
||||
// Only compare pretty output and don't try compiling
|
||||
pub pretty_compare_only: bool,
|
||||
// Patterns which must not appear in the output of a cfail test.
|
||||
pub forbid_output: Vec<String>,
|
||||
// Revisions to test for incremental compilation.
|
||||
pub revisions: Vec<String>,
|
||||
}
|
||||
|
||||
impl TestProps {
|
||||
pub fn new() -> Self {
|
||||
let error_patterns = Vec::new();
|
||||
let aux_builds = Vec::new();
|
||||
let exec_env = Vec::new();
|
||||
let run_flags = None;
|
||||
let pp_exact = None;
|
||||
let check_lines = Vec::new();
|
||||
let build_aux_docs = false;
|
||||
let force_host = false;
|
||||
let check_stdout = false;
|
||||
let no_prefer_dynamic = false;
|
||||
let pretty_expanded = false;
|
||||
let pretty_compare_only = false;
|
||||
let forbid_output = Vec::new();
|
||||
TestProps {
|
||||
error_patterns: error_patterns,
|
||||
compile_flags: vec![],
|
||||
run_flags: run_flags,
|
||||
pp_exact: pp_exact,
|
||||
aux_builds: aux_builds,
|
||||
revisions: vec![],
|
||||
rustc_env: vec![],
|
||||
exec_env: exec_env,
|
||||
check_lines: check_lines,
|
||||
build_aux_docs: build_aux_docs,
|
||||
force_host: force_host,
|
||||
check_stdout: check_stdout,
|
||||
no_prefer_dynamic: no_prefer_dynamic,
|
||||
pretty_expanded: pretty_expanded,
|
||||
pretty_mode: format!("normal"),
|
||||
pretty_compare_only: pretty_compare_only,
|
||||
forbid_output: forbid_output,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_file(testfile: &Path) -> Self {
|
||||
let mut props = TestProps::new();
|
||||
props.load_from(testfile, None);
|
||||
props
|
||||
}
|
||||
|
||||
/// Load properties from `testfile` into `props`. If a property is
|
||||
/// tied to a particular revision `foo` (indicated by writing
|
||||
/// `//[foo]`), then the property is ignored unless `cfg` is
|
||||
/// `Some("foo")`.
|
||||
pub fn load_from(&mut self, testfile: &Path, cfg: Option<&str>) {
|
||||
iter_header(testfile, cfg, &mut |ln| {
|
||||
if let Some(ep) = parse_error_pattern(ln) {
|
||||
self.error_patterns.push(ep);
|
||||
}
|
||||
|
||||
if let Some(flags) = parse_compile_flags(ln) {
|
||||
self.compile_flags.extend(
|
||||
flags
|
||||
.split_whitespace()
|
||||
.map(|s| s.to_owned()));
|
||||
}
|
||||
|
||||
if let Some(r) = parse_revisions(ln) {
|
||||
self.revisions.extend(r);
|
||||
}
|
||||
|
||||
if self.run_flags.is_none() {
|
||||
self.run_flags = parse_run_flags(ln);
|
||||
}
|
||||
|
||||
if self.pp_exact.is_none() {
|
||||
self.pp_exact = parse_pp_exact(ln, testfile);
|
||||
}
|
||||
|
||||
if !self.build_aux_docs {
|
||||
self.build_aux_docs = parse_build_aux_docs(ln);
|
||||
}
|
||||
|
||||
if !self.force_host {
|
||||
self.force_host = parse_force_host(ln);
|
||||
}
|
||||
|
||||
if !self.check_stdout {
|
||||
self.check_stdout = parse_check_stdout(ln);
|
||||
}
|
||||
|
||||
if !self.no_prefer_dynamic {
|
||||
self.no_prefer_dynamic = parse_no_prefer_dynamic(ln);
|
||||
}
|
||||
|
||||
if !self.pretty_expanded {
|
||||
self.pretty_expanded = parse_pretty_expanded(ln);
|
||||
}
|
||||
|
||||
if let Some(m) = parse_pretty_mode(ln) {
|
||||
self.pretty_mode = m;
|
||||
}
|
||||
|
||||
if !self.pretty_compare_only {
|
||||
self.pretty_compare_only = parse_pretty_compare_only(ln);
|
||||
}
|
||||
|
||||
if let Some(ab) = parse_aux_build(ln) {
|
||||
self.aux_builds.push(ab);
|
||||
}
|
||||
|
||||
if let Some(ee) = parse_env(ln, "exec-env") {
|
||||
self.exec_env.push(ee);
|
||||
}
|
||||
|
||||
if let Some(ee) = parse_env(ln, "rustc-env") {
|
||||
self.rustc_env.push(ee);
|
||||
}
|
||||
|
||||
if let Some(cl) = parse_check_line(ln) {
|
||||
self.check_lines.push(cl);
|
||||
}
|
||||
|
||||
if let Some(of) = parse_forbid_output(ln) {
|
||||
self.forbid_output.push(of);
|
||||
}
|
||||
});
|
||||
|
||||
for key in vec!["RUST_TEST_NOCAPTURE", "RUST_TEST_THREADS"] {
|
||||
match env::var(key) {
|
||||
Ok(val) =>
|
||||
if self.exec_env.iter().find(|&&(ref x, _)| *x == key).is_none() {
|
||||
self.exec_env.push((key.to_owned(), val))
|
||||
},
|
||||
Err(..) => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn iter_header(testfile: &Path,
|
||||
cfg: Option<&str>,
|
||||
|
||||
@ -39,6 +39,8 @@ use common::{Pretty, DebugInfoGdb, DebugInfoLldb, Mode};
|
||||
use test::TestPaths;
|
||||
use util::logv;
|
||||
|
||||
use self::header::EarlyProps;
|
||||
|
||||
pub mod procsrv;
|
||||
pub mod util;
|
||||
mod json;
|
||||
@ -394,7 +396,7 @@ pub fn is_test(config: &Config, testfile: &Path) -> bool {
|
||||
}
|
||||
|
||||
pub fn make_test(config: &Config, testpaths: &TestPaths) -> test::TestDescAndFn {
|
||||
let early_props = header::early_props(config, &testpaths.file);
|
||||
let early_props = EarlyProps::from_file(config, &testpaths.file);
|
||||
|
||||
// The `should-fail` annotation doesn't apply to pretty tests,
|
||||
// since we run the pretty printer across all tests by default.
|
||||
|
||||
@ -47,7 +47,7 @@ pub fn run(config: Config, testpaths: &TestPaths) {
|
||||
print!("\n\n");
|
||||
}
|
||||
debug!("running {:?}", testpaths.file.display());
|
||||
let props = header::load_props(&testpaths.file);
|
||||
let props = TestProps::from_file(&testpaths.file);
|
||||
debug!("loaded props");
|
||||
match config.mode {
|
||||
CompileFail => run_cfail_test(&config, &props, &testpaths),
|
||||
@ -84,9 +84,7 @@ fn for_each_revision<OP>(config: &Config, props: &TestProps, testpaths: &TestPat
|
||||
} else {
|
||||
for revision in &props.revisions {
|
||||
let mut revision_props = props.clone();
|
||||
header::load_props_into(&mut revision_props,
|
||||
&testpaths.file,
|
||||
Some(&revision));
|
||||
revision_props.load_from(&testpaths.file, Some(&revision));
|
||||
revision_props.compile_flags.extend(vec![
|
||||
format!("--cfg"),
|
||||
format!("{}", revision),
|
||||
@ -1174,7 +1172,7 @@ fn document(config: &Config,
|
||||
if props.build_aux_docs {
|
||||
for rel_ab in &props.aux_builds {
|
||||
let aux_testpaths = compute_aux_test_paths(config, testpaths, rel_ab);
|
||||
let aux_props = header::load_props(&aux_testpaths.file);
|
||||
let aux_props = TestProps::from_file(&aux_testpaths.file);
|
||||
let auxres = document(config, &aux_props, &aux_testpaths, out_dir);
|
||||
if !auxres.status.success() {
|
||||
return auxres;
|
||||
@ -1249,7 +1247,7 @@ fn compose_and_run_compiler(config: &Config, props: &TestProps,
|
||||
|
||||
for rel_ab in &props.aux_builds {
|
||||
let aux_testpaths = compute_aux_test_paths(config, testpaths, rel_ab);
|
||||
let aux_props = header::load_props(&aux_testpaths.file);
|
||||
let aux_props = TestProps::from_file(&aux_testpaths.file);
|
||||
let mut crate_type = if aux_props.no_prefer_dynamic {
|
||||
Vec::new()
|
||||
} else {
|
||||
@ -2044,7 +2042,7 @@ fn run_incremental_test(config: &Config, props: &TestProps, testpaths: &TestPath
|
||||
|
||||
for revision in &props.revisions {
|
||||
let mut revision_props = props.clone();
|
||||
header::load_props_into(&mut revision_props, &testpaths.file, Some(&revision));
|
||||
revision_props.load_from(&testpaths.file, Some(&revision));
|
||||
|
||||
revision_props.compile_flags.extend(vec![
|
||||
format!("-Z"),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user