mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #127677 - onur-ozkan:use-correct-modes, r=Kobzol

Browse Source 
using correct tool mode for `run-make-support` crate

We don't need to ensure std (and rustc) for testing run-make-support's unit tests. Using stage 0 compiler is already enough and speeds up `x test run-make-support` invocations on a clean build.
This commit is contained in:
Jubilee 2024-07-13 20:18:24 -07:00 committed by GitHub
commit 9201f18310
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/src/core/build_steps/test.rs
View File

@ -682,6 +682,8 @@ fn run(self, builder: &Builder<'_>) {
let mut cargo = tool::prepare_tool_cargo( let mut cargo = tool::prepare_tool_cargo(
builder, builder,
compiler, compiler,
// compiletest uses libtest internals; make it use the in-tree std to make sure it never breaks
// when std sources change.
Mode::ToolStd, Mode::ToolStd,
host, host,
"test", "test",
@ -1321,13 +1323,12 @@ fn make_run(run: RunConfig<'_>) {
/// Runs `cargo test` for run-make-support. /// Runs `cargo test` for run-make-support.
fn run(self, builder: &Builder<'_>) { fn run(self, builder: &Builder<'_>) {
let host = self.host; let host = self.host;
let compiler = builder.compiler(builder.top_stage, host); let compiler = builder.compiler(0, host);
builder.ensure(compile::Std::new(compiler, host));
let mut cargo = tool::prepare_tool_cargo( let mut cargo = tool::prepare_tool_cargo(
builder, builder,
compiler, compiler,
Mode::ToolStd, Mode::ToolBootstrap,
host, host,
"test", "test",
"src/tools/run-make-support", "src/tools/run-make-support",