diff options
| author | bors <bors@rust-lang.org> | 2018-03-22 16:58:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-22 16:58:57 +0000 |
| commit | 5092c6b01acbff60935a5e6d84f83b6c73c1ca5e (patch) | |
| tree | bdc8568384c95b430e9bb324b82a876d98b1f56a /src/bootstrap | |
| parent | b176285ba775f86301040fc624acb96b4499f562 (diff) | |
| parent | 2c6f911463efa6c2d87e5566fc1cd77a7d26509a (diff) | |
| download | rust-5092c6b01acbff60935a5e6d84f83b6c73c1ca5e.tar.gz rust-5092c6b01acbff60935a5e6d84f83b6c73c1ca5e.zip | |
Auto merge of #49264 - kennytm:rollup, r=kennytm
Rollup of 23 pull requests - Successful merges: #48374, #48596, #48759, #48939, #49029, #49069, #49093, #49109, #49117, #49140, #49158, #49188, #49189, #49209, #49211, #49216, #49225, #49231, #49234, #49242, #49244, #49105, #49038 - Failed merges:
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/builder.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 3fd50f17ef3..a398bcc9737 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -310,12 +310,14 @@ impl<'a> Builder<'a> { test::UiFullDeps, test::RunPassFullDeps, test::RunFailFullDeps, test::CompileFailFullDeps, test::IncrementalFullDeps, test::Rustdoc, test::Pretty, test::RunPassPretty, test::RunFailPretty, test::RunPassValgrindPretty, - test::RunPassFullDepsPretty, test::RunFailFullDepsPretty, test::RunMake, + test::RunPassFullDepsPretty, test::RunFailFullDepsPretty, test::Crate, test::CrateLibrustc, test::CrateRustdoc, test::Linkcheck, test::Cargotest, test::Cargo, test::Rls, test::ErrorIndex, test::Distcheck, test::Nomicon, test::Reference, test::RustdocBook, test::RustByExample, test::TheBook, test::UnstableBook, - test::Rustfmt, test::Miri, test::Clippy, test::RustdocJS, test::RustdocTheme), + test::Rustfmt, test::Miri, test::Clippy, test::RustdocJS, test::RustdocTheme, + // Run run-make last, since these won't pass without make on Windows + test::RunMake), Kind::Bench => describe!(test::Crate, test::CrateLibrustc), Kind::Doc => describe!(doc::UnstableBook, doc::UnstableBookGen, doc::TheBook, doc::Standalone, doc::Std, doc::Test, doc::Rustc, doc::ErrorIndex, doc::Nomicon, |