diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2025-08-20 20:42:08 +0200 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2025-09-01 08:54:37 +0200 |
| commit | 6c3a86b73b6ce93f392768f5cdc9da9bd6283b32 (patch) | |
| tree | ca88f411e5ce633fba61d012ae22b3dee65d675f /src/bootstrap | |
| parent | 8e97112ba83c97891bcaafa13f099bd22ccd29f8 (diff) | |
| download | rust-6c3a86b73b6ce93f392768f5cdc9da9bd6283b32.tar.gz rust-6c3a86b73b6ce93f392768f5cdc9da9bd6283b32.zip | |
Do not run `lint-docs` tests in stage 1 `x test` by default
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/test.rs | 9 | ||||
| -rw-r--r-- | src/bootstrap/src/core/builder/tests.rs | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs index 3938c640321..97db9bf536f 100644 --- a/src/bootstrap/src/core/build_steps/test.rs +++ b/src/bootstrap/src/core/build_steps/test.rs @@ -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 }; @@ -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) diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs index e6cf34ed499..ef01f14f5e9 100644 --- a/src/bootstrap/src/core/builder/tests.rs +++ b/src/bootstrap/src/core/builder/tests.rs @@ -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> "); } @@ -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> @@ -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> @@ -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> @@ -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> "); } |