/// test` to ensure that we don't regress the test suites there.
fn run(self, builder: &Builder<'_>) {
let compiler = builder.compiler(self.stage, self.host);
- builder.ensure(compile::Rustc { compiler, target: compiler.host });
+ builder.ensure(compile::Rustc::new(compiler, compiler.host));
let cargo = builder.ensure(tool::Cargo { compiler, target: compiler.host });
// Note that this is a short, cryptic, and not scoped directory name. This
// We need `ToolStd` for the locally-built sysroot because
// compiletest uses unstable features of the `test` crate.
- builder.ensure(compile::Std { compiler, target: host });
+ builder.ensure(compile::Std::new(compiler, host));
let cargo = tool::prepare_tool_cargo(
builder,
compiler,
}
if !builder.config.cmd.bless() {
- std::process::exit(1);
+ crate::detail_exit(1);
}
let mut cargo = builder.cargo(compiler, Mode::ToolRustc, SourceType::InTree, host, "run");
let nodejs = builder.config.nodejs.as_ref().expect("nodejs isn't available");
let npm = builder.config.npm.as_ref().expect("npm isn't available");
- builder.ensure(compile::Std { compiler: self.compiler, target: self.target });
+ builder.ensure(compile::Std::new(self.compiler, self.target));
// The goal here is to check if the necessary packages are installed, and if not, we
// panic.
PATH = inferred_rustfmt_dir.display(),
CHAN = builder.config.channel,
);
- std::process::exit(1);
+ crate::detail_exit(1);
}
crate::format::format(&builder, !builder.config.cmd.bless(), &[]);
}
help: to test the standard library, use `--stage 0 library/std` instead
note: if you're sure you want to do this, please open an issue as to why. In the meantime, you can override this with `COMPILETEST_FORCE_STAGE0=1`."
);
- std::process::exit(1);
+ crate::detail_exit(1);
}
let compiler = self.compiler;
}
if suite.ends_with("fulldeps") {
- builder.ensure(compile::Rustc { compiler, target });
+ builder.ensure(compile::Rustc::new(compiler, target));
}
- builder.ensure(compile::Std { compiler, target });
+ builder.ensure(compile::Std::new(compiler, target));
// ensure that `libproc_macro` is available on the host.
- builder.ensure(compile::Std { compiler, target: compiler.host });
+ builder.ensure(compile::Std::new(compiler, compiler.host));
// Also provide `rust_test_helpers` for the host.
builder.ensure(native::TestHelpers { target: compiler.host });
fn run_ext_doc(self, builder: &Builder<'_>) {
let compiler = self.compiler;
- builder.ensure(compile::Std { compiler, target: compiler.host });
+ builder.ensure(compile::Std::new(compiler, compiler.host));
// mdbook just executes a binary named "rustdoc", so we need to update
// PATH so that it points to our rustdoc.
fn run_local_doc(self, builder: &Builder<'_>) {
let compiler = self.compiler;
- builder.ensure(compile::Std { compiler, target: compiler.host });
+ builder.ensure(compile::Std::new(compiler, compiler.host));
// Do a breadth-first traversal of the `src/doc` directory and just run
// tests for all files that end in `*.md`
builder.run_quiet(&mut tool);
// The tests themselves need to link to std, so make sure it is
// available.
- builder.ensure(compile::Std { compiler, target: compiler.host });
+ builder.ensure(compile::Std::new(compiler, compiler.host));
markdown_test(builder, compiler, &output);
}
}
const ONLY_HOSTS: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.krate("rustc-main")
+ run.crate_or_deps("rustc-main")
}
fn make_run(run: RunConfig<'_>) {
const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.krate("test")
+ run.crate_or_deps("test")
}
fn make_run(run: RunConfig<'_>) {
let mode = self.mode;
let test_kind = self.test_kind;
- builder.ensure(compile::Std { compiler, target });
+ builder.ensure(compile::Std::new(compiler, target));
builder.ensure(RemoteCopyLibs { compiler, target });
// If we're not doing a full bootstrap but we're testing a stage2
// isn't really necessary.
builder.compiler_for(builder.top_stage, target, target)
};
- builder.ensure(compile::Rustc { compiler, target });
+ builder.ensure(compile::Rustc::new(compiler, target));
let mut cargo = tool::prepare_tool_cargo(
builder,
// `compiler`, then it would cause rustdoc to be built *again*, which
// isn't really necessary.
let compiler = builder.compiler_for(builder.top_stage, target, target);
- builder.ensure(compile::Rustc { compiler, target });
+ builder.ensure(compile::Rustc::new(compiler, target));
let mut cargo = tool::prepare_tool_cargo(
builder,
return;
}
- builder.ensure(compile::Std { compiler, target });
+ builder.ensure(compile::Std::new(compiler, target));
builder.info(&format!("REMOTE copy libs to emulator ({})", target));
/// Tests the Platform Support page in the rustc book.
fn run(self, builder: &Builder<'_>) {
- builder.ensure(compile::Std { compiler: self.compiler, target: self.compiler.host });
+ builder.ensure(compile::Std::new(self.compiler, self.compiler.host));
let mut cargo = tool::prepare_tool_cargo(
builder,
self.compiler,