Skip to content

Commit 06dca67

Browse files
Auto merge of #145663 - Kobzol:bootstrap-test, r=<try>
Enforce in bootstrap that test must have stage at least 1 (except for compiletest) try-job: dist-x86_64-linux try-job: aarch64-gnu try-job: arm-android try-job: `x86_64-gnu-llvm-20*` try-job: `x86_64-msvc-*` try-job: aarch64-apple
2 parents e8a792d + fb0c179 commit 06dca67

File tree

10 files changed

+579
-368
lines changed

10 files changed

+579
-368
lines changed

src/bootstrap/src/core/build_steps/check.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use crate::core::build_steps::compile::{
88
};
99
use crate::core::build_steps::tool;
1010
use crate::core::build_steps::tool::{
11-
COMPILETEST_ALLOW_FEATURES, SourceType, ToolTargetBuildMode, get_tool_target_compiler,
12-
prepare_tool_cargo,
11+
COMPILETEST_ALLOW_FEATURES, SourceType, TEST_FLOAT_PARSE_ALLOW_FEATURES, ToolTargetBuildMode,
12+
get_tool_target_compiler, prepare_tool_cargo,
1313
};
1414
use crate::core::builder::{
1515
self, Alias, Builder, Cargo, Kind, RunConfig, ShouldRun, Step, StepMetadata, crate_description,
@@ -791,7 +791,7 @@ tool_check_step!(MiroptTestTools {
791791
tool_check_step!(TestFloatParse {
792792
path: "src/tools/test-float-parse",
793793
mode: |_builder| Mode::ToolStd,
794-
allow_features: tool::TestFloatParse::ALLOW_FEATURES
794+
allow_features: TEST_FLOAT_PARSE_ALLOW_FEATURES
795795
});
796796
tool_check_step!(FeaturesStatusDump {
797797
path: "src/tools/features-status-dump",

src/bootstrap/src/core/build_steps/doc.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,11 @@ fn doc_std(
791791
}
792792

793793
/// Prepare a compiler that will be able to document something for `target` at `stage`.
794-
fn prepare_doc_compiler(builder: &Builder<'_>, target: TargetSelection, stage: u32) -> Compiler {
794+
pub fn prepare_doc_compiler(
795+
builder: &Builder<'_>,
796+
target: TargetSelection,
797+
stage: u32,
798+
) -> Compiler {
795799
assert!(stage > 0, "Cannot document anything in stage 0");
796800
let build_compiler = builder.compiler(stage - 1, builder.host_target);
797801
builder.std(build_compiler, target);

0 commit comments

Comments
 (0)