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

fix the incorrect target on stage1 ui-fulldeps tests

Browse Source 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
onur-ozkan 2024-01-07 11:40:09 +03:00
parent 26c71cbcf1
commit b888e2f82b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1596,8 +1596,13 @@ fn run(self, builder: &Builder<'_>) {
// NOTE: Only stage 1 is special cased because we need the rustc_private artifacts to match the // NOTE: Only stage 1 is special cased because we need the rustc_private artifacts to match the
// running compiler in stage 2 when plugins run. // running compiler in stage 2 when plugins run.
let stage_id = if suite == "ui-fulldeps" && compiler.stage == 1 { let stage_id = if suite == "ui-fulldeps" && compiler.stage == 1 {
compiler = builder.compiler(compiler.stage - 1, target); // At stage 0 (stage - 1) we are using the beta compiler. Using `self.target` can lead finding
format!("stage{}-{}", compiler.stage + 1, target) // an incorrect compiler path on cross-targets, as the stage 0 beta compiler is always equal
// to `build.build` in the configuration.
let build = builder.build.build;
compiler = builder.compiler(compiler.stage - 1, build);
format!("stage{}-{}", compiler.stage + 1, build)
} else { } else {
format!("stage{}-{}", compiler.stage, target) format!("stage{}-{}", compiler.stage, target)
}; };