Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Consolidate staging for compiletest steps in bootstrap #146076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 2, 2025
Merged

Consolidate staging for compiletest steps in bootstrap #146076

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
99583d1
Remove outdated comment
Kobzol Aug 20, 2025
2bfff32
Add some compiletest suites snapshot tests
Kobzol Aug 20, 2025
72167b7
Rename `compiler` to `test_compiler`
Kobzol Aug 20, 2025
8e97112
Remove `Compiler::with_stage`
Kobzol Aug 20, 2025
6c3a86b
Do not run `lint-docs` tests in stage 1 `x test` by default
Kobzol Aug 20, 2025
6f5fc69
Consolidate staging of test steps in message groups
Kobzol Sep 1, 2025
af627f5
Fix ui-fulldeps
Kobzol Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Do not run lint-docs tests in stage 1 x test by default
  • Loading branch information
@Kobzol
Kobzol committed Sep 1, 2025
commit 6c3a86b73b6ce93f392768f5cdc9da9bd6283b32
9 changes: 6 additions & 3 deletions src/bootstrap/src/core/build_steps/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1848,12 +1848,15 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
let is_rustdoc = suite == "rustdoc-ui" || suite == "rustdoc-js";

if mode == "run-make" {
let cargo_path = if builder.top_stage == 0 {
let cargo_path = if test_compiler.stage == 0 {
// If we're using `--stage 0`, we should provide the bootstrap cargo.
builder.initial_cargo.clone()
} else {
builder
.ensure(tool::Cargo::from_build_compiler(test_compiler, test_compiler.host))
.ensure(tool::Cargo::from_build_compiler(
builder.compiler(test_compiler.stage - 1, test_compiler.host),
test_compiler.host,
))
.tool_path
};

Expand Down Expand Up @@ -1902,7 +1905,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the

// When top stage is 0, that means that we're testing an externally provided compiler.
// In that case we need to use its specific sysroot for tests to pass.
let sysroot = if builder.top_stage == 0 {
let sysroot = if test_compiler.stage == 0 {
builder.initial_sysroot.clone()
} else {
builder.sysroot(test_compiler)
Expand Down
10 changes: 5 additions & 5 deletions src/bootstrap/src/core/builder/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2124,7 +2124,7 @@ mod snapshot {
[build] rustc 0 <host> -> HtmlChecker 1 <host>
[test] html-check <host>
[build] rustc 0 <host> -> RunMakeSupport 1 <host>
[build] rustc 1 <host> -> cargo 2 <host>
[build] rustc 0 <host> -> cargo 1 <host>
[test] compiletest-run-make 1 <host>
");
}
Expand All @@ -2143,7 +2143,7 @@ mod snapshot {
[test] compiletest-ui 1 <host>
[test] compiletest-ui-fulldeps 1 <host>
[build] rustc 0 <host> -> RunMakeSupport 1 <host>
[build] rustc 1 <host> -> cargo 2 <host>
[build] rustc 0 <host> -> cargo 1 <host>
[build] rustdoc 1 <host>
[test] compiletest-run-make 1 <host>
[test] compiletest-rustdoc 1 <host>
Expand Down Expand Up @@ -2172,7 +2172,7 @@ mod snapshot {
[build] rustc 2 <host> -> rustc 3 <host>
[test] compiletest-ui-fulldeps 2 <host>
[build] rustc 0 <host> -> RunMakeSupport 1 <host>
[build] rustc 2 <host> -> cargo 3 <host>
[build] rustc 1 <host> -> cargo 2 <host>
[build] rustdoc 2 <host>
[test] compiletest-run-make 2 <host>
[test] compiletest-rustdoc 2 <host>
Expand Down Expand Up @@ -2206,7 +2206,7 @@ mod snapshot {
[build] rustc 2 <host> -> rustc 3 <target1>
[test] compiletest-ui-fulldeps 2 <target1>
[build] rustc 0 <host> -> RunMakeSupport 1 <host>
[build] rustc 2 <host> -> cargo 3 <host>
[build] rustc 1 <host> -> cargo 2 <host>
[build] rustdoc 2 <host>
[test] compiletest-run-make 2 <target1>
[test] compiletest-rustdoc 2 <target1>
Expand Down Expand Up @@ -2301,7 +2301,7 @@ mod snapshot {
[build] rustc 0 <host> -> HtmlChecker 1 <host>
[test] html-check <host>
[build] rustc 0 <host> -> RunMakeSupport 1 <host>
[build] rustc 2 <host> -> cargo 3 <host>
[build] rustc 1 <host> -> cargo 2 <host>
[test] compiletest-run-make 2 <host>
");
}
Expand Down