about summary refs log tree commit diff
path: root/src/bootstrap/test.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-02-18 17:50:21 +0000
committerbors <bors@rust-lang.org>2018-02-18 17:50:21 +0000
commit27a046e9338fb0455c33b13e8fe28da78212dedc (patch)
tree004849f31563f7dd4c1eb9f54d12ad392887c077 /src/bootstrap/test.rs
parent1ad094d81c97b3d2dd8e980ccd1475a80647540d (diff)
parentcc20de3993bc47be613d20fdd4ec3c35cc410fcd (diff)
downloadrust-27a046e9338fb0455c33b13e8fe28da78212dedc.tar.gz
rust-27a046e9338fb0455c33b13e8fe28da78212dedc.zip
Auto merge of #48322 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 6 pull requests

- Successful merges: #48194, #48273, #48274, #48275, #48282, #48312
- Failed merges:
Diffstat (limited to 'src/bootstrap/test.rs')
-rw-r--r--src/bootstrap/test.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 64ede4f4ecc..bd8c36a296c 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -935,7 +935,7 @@ impl Step for Compiletest {
             }
         }
         if suite == "run-make" && !build.config.llvm_enabled {
-            println!("Ignoring run-make test suite as they generally dont work without LLVM");
+            println!("Ignoring run-make test suite as they generally don't work without LLVM");
             return;
         }
 
@@ -1355,6 +1355,9 @@ impl Step for Crate {
         if test_kind.subcommand() == "test" && !build.fail_fast {
             cargo.arg("--no-fail-fast");
         }
+        if build.doc_tests {
+            cargo.arg("--doc");
+        }
 
         cargo.arg("-p").arg(krate);