Skip to content

Commit

Permalink
Rollup merge of rust-lang#49465 - ollie27:rustbuild_test_docs, r=stev…
Browse files Browse the repository at this point in the history
…eklabnik,QuietMisdreavus,frewsxcv,GuillaumeGomez

Add docs for the test crate with the std docs

If the compiler docs aren't going to include the test crate then it may as well be included with std.

Fixes rust-lang#49388
  • Loading branch information
kennytm committed Apr 14, 2018
2 parents c22b4db + e719bb0 commit 15eb465
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/bootstrap/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ impl Step for Test {

fn should_run(run: ShouldRun) -> ShouldRun {
let builder = run.builder;
run.krate("test").default_condition(builder.config.compiler_docs)
run.krate("test").default_condition(builder.build.config.docs)
}

fn make_run(run: RunConfig) {
Expand Down Expand Up @@ -557,6 +557,9 @@ impl Step for Test {

let mut cargo = builder.cargo(compiler, Mode::Libtest, target, "doc");
compile::test_cargo(build, &compiler, target, &mut cargo);

cargo.arg("--no-deps").arg("-p").arg("test");

build.run(&mut cargo);
build.cp_r(&my_out, &out);
}
Expand Down

0 comments on commit 15eb465

Please sign in to comment.