bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Teach rustdoc --test about --sysroot, pass it when testing rust

Browse source 
This permits rustdoc tests to work in stage0
This commit is contained in:
Aidan Hobson Sayers 2016-12-24 16:04:48 +00:00
parent 17d873c2db
commit babb7daf35
5 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustdoc/lib.rs
View file

@ -267,13 +267,14 @@ pub fn main_args(args: &[String]) -> isize {
};
let crate_name = matches.opt_str("crate-name");
let playground_url = matches.opt_str("playground-url");
let maybe_sysroot = matches.opt_str("sysroot").map(PathBuf::from);
match (should_test, markdown_input) {
(true, true) => {
return markdown::test(input, cfgs, libs, externs, test_args)
return markdown::test(input, cfgs, libs, externs, test_args, maybe_sysroot)
}
(true, false) => {
return test::run(input, cfgs, libs, externs, test_args, crate_name)
return test::run(input, cfgs, libs, externs, test_args, crate_name, maybe_sysroot)
}
(false, true) => return markdown::render(input,
output.unwrap_or(PathBuf::from("doc")),