about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2018-03-20 15:33:22 +0100
committerJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2018-03-20 15:33:22 +0100
commit859640a3ca99490ea7415449d84ccf87ee7c439c (patch)
tree519585d427994dd474a690aafa92248e40eac542 /src/bootstrap
parenta04b88d1941644df01fa5e31dd43e0f57c13d938 (diff)
downloadrust-859640a3ca99490ea7415449d84ccf87ee7c439c.tar.gz
rust-859640a3ca99490ea7415449d84ccf87ee7c439c.zip
Run the `run-make` tests last, so more tests run on Windows when `make` is unavailable
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/builder.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 675d3dd437e..07026cbe265 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -308,12 +308,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,