From 18bb86e5e11a70eb6ba9365499a9061c49581eee Mon Sep 17 00:00:00 2001 From: Mark Simulacrum Date: Sat, 16 Jun 2018 11:11:06 -0600 Subject: [PATCH 1/2] Move bootstrap tests to the end of the default test run Since they are unlikely to fail and are almost never going to fail except with bootstrap changes (which would be tested locally anyway) it makes sense to run these tests close to last. --- src/bootstrap/builder.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index d482a0d565027..ec7eebd1d0189 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -370,7 +370,6 @@ impl<'a> Builder<'a> { ), Kind::Test => describe!( test::Tidy, - test::Bootstrap, test::Ui, test::RunPass, test::CompileFail, @@ -416,6 +415,8 @@ impl<'a> Builder<'a> { test::Clippy, test::RustdocJS, test::RustdocTheme, + // Run bootstrap close to the end as it's unlikely to fail + test::Bootstrap, // Run run-make last, since these won't pass without make on Windows test::RunMake, test::RustdocUi From b436dca9e6d9bb47c9f63b7269c19392c60833d0 Mon Sep 17 00:00:00 2001 From: Mark Simulacrum Date: Sat, 16 Jun 2018 11:12:15 -0600 Subject: [PATCH 2/2] Prevent Windows filesystem races in bootstrap tests --- src/bootstrap/test.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index a0b6222421d71..ce6506b0a10fa 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1921,6 +1921,9 @@ impl Step for Bootstrap { cmd.arg("--no-fail-fast"); } cmd.arg("--").args(&builder.config.cmd.test_args()); + // rustbuild tests are racy on directory creation so just run them one at a time. + // Since there's not many this shouldn't be a problem. + cmd.arg("--test-threads=1"); try_run(builder, &mut cmd); }