bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

create new option build.compiletest-use-stage0-libtest

Browse source 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
onur-ozkan 2025-04-04 20:16:28 +03:00
parent da8321773a
commit 86a7ee603c
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bootstrap.example.toml
View file

@ -28,7 +28,7 @@
# - A new option # - A new option
# - A change in the default values # - A change in the default values
# #
# If the change-id does not match the version currently in use, x.py will # If the change-id does not match the version currently in use, x.py will
# display the changes made to the bootstrap. # display the changes made to the bootstrap.
# To suppress these warnings, you can set change-id = "ignore". # To suppress these warnings, you can set change-id = "ignore".
#change-id = <latest change id in src/bootstrap/src/utils/change_tracker.rs> #change-id = <latest change id in src/bootstrap/src/utils/change_tracker.rs>
@ -442,6 +442,9 @@
# What custom diff tool to use for displaying compiletest tests. # What custom diff tool to use for displaying compiletest tests.
#compiletest-diff-tool = <none> #compiletest-diff-tool = <none>
# Whether to use the precompiled stage0 libtest with compiletest.
#compiletest-use-stage0-libtest = true
# Indicates whether ccache is used when building certain artifacts (e.g. LLVM). # Indicates whether ccache is used when building certain artifacts (e.g. LLVM).
# Set to `true` to use the first `ccache` in PATH, or set an absolute path to use # Set to `true` to use the first `ccache` in PATH, or set an absolute path to use
# a specific version. # a specific version.

6
src/bootstrap/src/core/config/config.rs
View file

@ -417,6 +417,9 @@ pub struct Config {
/// Command for visual diff display, e.g. `diff-tool --color=always`. /// Command for visual diff display, e.g. `diff-tool --color=always`.
pub compiletest_diff_tool: Option<String>, pub compiletest_diff_tool: Option<String>,
/// Whether to use the precompiled stage0 libtest with compiletest.
pub compiletest_use_stage0_libtest: bool,
pub is_running_on_ci: bool, pub is_running_on_ci: bool,
} }
@ -983,6 +986,7 @@ define_config! {
optimized_compiler_builtins: Option<bool> = "optimized-compiler-builtins", optimized_compiler_builtins: Option<bool> = "optimized-compiler-builtins",
jobs: Option<u32> = "jobs", jobs: Option<u32> = "jobs",
compiletest_diff_tool: Option<String> = "compiletest-diff-tool", compiletest_diff_tool: Option<String> = "compiletest-diff-tool",
compiletest_use_stage0_libtest: Option<bool> = "compiletest-use-stage0-libtest",
ccache: Option<StringOrBool> = "ccache", ccache: Option<StringOrBool> = "ccache",
exclude: Option<Vec<PathBuf>> = "exclude", exclude: Option<Vec<PathBuf>> = "exclude",
} }
@ -1682,6 +1686,7 @@ impl Config {
optimized_compiler_builtins, optimized_compiler_builtins,
jobs, jobs,
compiletest_diff_tool, compiletest_diff_tool,
compiletest_use_stage0_libtest,
mut ccache, mut ccache,
exclude, exclude,
} = toml.build.unwrap_or_default(); } = toml.build.unwrap_or_default();
@ -2415,6 +2420,7 @@ impl Config {
config.optimized_compiler_builtins = config.optimized_compiler_builtins =
optimized_compiler_builtins.unwrap_or(config.channel != "dev"); optimized_compiler_builtins.unwrap_or(config.channel != "dev");
config.compiletest_diff_tool = compiletest_diff_tool; config.compiletest_diff_tool = compiletest_diff_tool;
config.compiletest_use_stage0_libtest = compiletest_use_stage0_libtest.unwrap_or(true);
let download_rustc = config.download_rustc_commit.is_some(); let download_rustc = config.download_rustc_commit.is_some();
config.explicit_stage_from_cli = flags.stage.is_some(); config.explicit_stage_from_cli = flags.stage.is_some();