about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-04-14 15:22:17 +0800
committerkennytm <kennytm@gmail.com>2018-04-14 15:22:17 +0800
commit15eb465b353adc7a45af89e426dced4dbca2a536 (patch)
tree0ae042ad21ae06482f423674520f0aef59adbecc /src/bootstrap
parentc22b4db0f5e17e18f1099a803945cb0e96ac3c56 (diff)
parente719bb048e32c00fb9d9b2236a61b7a379ce4f1b (diff)
downloadrust-15eb465b353adc7a45af89e426dced4dbca2a536.tar.gz
rust-15eb465b353adc7a45af89e426dced4dbca2a536.zip
Rollup merge of #49465 - ollie27:rustbuild_test_docs, r=steveklabnik,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 #49388
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/doc.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index 4237ded2215..620e125a43d 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -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) {
@@ -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);
     }