diff options
| -rw-r--r-- | src/bootstrap/builder.rs | 3 | ||||
| -rw-r--r-- | src/bootstrap/test.rs | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index d482a0d5650..ec7eebd1d01 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 diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index a0b6222421d..ce6506b0a10 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); } |