Revert "Add a file to trivially disable tool building or testing"
This reverts commit ab018c76e14b87f3c9e0b7384cc9b02d94779cd5.
This also adds the `ToolBuild::is_ext_tool` field to replace the previous
`ToolBuild::expectation` field, to indicate whether a build-failure of
certain tool is essential.
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index eee403d..79a6a39 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -23,7 +23,7 @@
use std::process::Command;
use std::io::Read;
-use build_helper::{self, output, BuildExpectation};
+use build_helper::{self, output};
use builder::{Kind, RunConfig, ShouldRun, Builder, Compiler, Step};
use cache::{INTERNER, Interned};
@@ -65,23 +65,19 @@
}
}
-fn try_run_expecting(build: &Build, cmd: &mut Command, expect: BuildExpectation) -> bool {
+fn try_run(build: &Build, cmd: &mut Command) -> bool {
if !build.fail_fast {
- if !build.try_run(cmd, expect) {
+ if !build.try_run(cmd) {
let mut failures = build.delayed_failures.borrow_mut();
failures.push(format!("{:?}", cmd));
return false;
}
} else {
- build.run_expecting(cmd, expect);
+ build.run(cmd);
}
true
}
-fn try_run(build: &Build, cmd: &mut Command) {
- try_run_expecting(build, cmd, BuildExpectation::None);
-}
-
fn try_run_quiet(build: &Build, cmd: &mut Command) {
if !build.fail_fast {
if !build.try_run_quiet(cmd) {
@@ -259,11 +255,7 @@
builder.add_rustc_lib_path(compiler, &mut cargo);
- if try_run_expecting(
- build,
- &mut cargo,
- builder.build.config.toolstate.rls.passes(ToolState::Testing),
- ) {
+ if try_run(build, &mut cargo) {
build.save_toolstate("rls", ToolState::Testing);
}
}
@@ -309,11 +301,7 @@
builder.add_rustc_lib_path(compiler, &mut cargo);
- if try_run_expecting(
- build,
- &mut cargo,
- builder.build.config.toolstate.rustfmt.passes(ToolState::Testing),
- ) {
+ if try_run(build, &mut cargo) {
build.save_toolstate("rustfmt", ToolState::Testing);
}
}
@@ -363,11 +351,7 @@
builder.add_rustc_lib_path(compiler, &mut cargo);
- if try_run_expecting(
- build,
- &mut cargo,
- builder.build.config.toolstate.miri.passes(ToolState::Testing),
- ) {
+ if try_run(build, &mut cargo) {
build.save_toolstate("miri", ToolState::Testing);
}
} else {
@@ -422,11 +406,7 @@
builder.add_rustc_lib_path(compiler, &mut cargo);
- if try_run_expecting(
- build,
- &mut cargo,
- builder.build.config.toolstate.clippy.passes(ToolState::Testing),
- ) {
+ if try_run(build, &mut cargo) {
build.save_toolstate("clippy-driver", ToolState::Testing);
}
} else {
