Skip to content

Rollup of 4 pull requests #144692

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 17 commits into from
Jul 30, 2025
Merged

Rollup of 4 pull requests #144692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d622bfd
Display total time and compilation time of merged doctests
GuillaumeGomez Jul 22, 2025
64e3078
Update rustdoc ui tests
GuillaumeGomez Jul 22, 2025
e008fe0
Avoid redundant lookup in CrateLoader::existing_match
kornelski Jul 19, 2025
671e083
Clarify update_extern_crate
kornelski Jul 3, 2025
8a0f976
Save names of used extern crates
kornelski Jul 15, 2025
0813cc9
Test renamed crates in rustdoc
kornelski Jul 5, 2025
276c423
Support multiple crate versions in --extern-html-root-url
kornelski Jul 3, 2025
0cf6eb5
Introduce proper `build.compiletest-allow-stage0` config option
jieyouxu Jul 30, 2025
a7fcc73
Update `codegen_{cranelift,gcc}` and `opt-dist` to use `build.compile…
jieyouxu Jul 30, 2025
2033a06
Deny `compiletest` self-tests being run against stage 0 rustc unless …
jieyouxu Jul 30, 2025
2cdd193
Run `compiletest` self-tests against stage 1 rustc
jieyouxu Jul 30, 2025
e954253
Add change tracker entry
jieyouxu Jul 30, 2025
1d589c8
clean up codegen fn attrs
jdonszelmann Jul 29, 2025
b38ece9
Rollup merge of #143465 - kornelski:extern-name, r=petrochenkov
samueltardieu Jul 30, 2025
61760fb
Rollup merge of #144308 - GuillaumeGomez:merged-doctest-times, r=lolb…
samueltardieu Jul 30, 2025
1751219
Rollup merge of #144655 - jdonszelmann:cleanup-codegen-fn-attrs, r=Wa…
samueltardieu Jul 30, 2025
202d1f5
Rollup merge of #144675 - jieyouxu:compiletest-staging, r=Kobzol
samueltardieu Jul 30, 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
5 changes: 5 additions & 0 deletions bootstrap.example.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,11 @@
# What custom diff tool to use for displaying compiletest tests.
#build.compiletest-diff-tool = <none>

# Whether to allow `compiletest` self-tests and `compiletest`-managed test
# suites to be run against the stage 0 rustc. This is only intended to be used
# when the stage 0 compiler is actually built from in-tree sources.
#build.compiletest-allow-stage0 = false

# Whether to use the precompiled stage0 libtest with compiletest.
#build.compiletest-use-stage0-libtest = true

Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_codegen_cranelift/scripts/setup_rust_fork.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ rustc = "$(pwd)/../dist/bin/rustc-clif"
cargo = "$(rustup which cargo)"
full-bootstrap = true
local-rebuild = true
compiletest-allow-stage0 = true

[rust]
download-rustc = false
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_cranelift/scripts/test_rustc_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,5 +166,5 @@ index 073116933bd..c3e4578204d 100644
EOF

echo "[TEST] rustc test suite"
COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 --test-args=--no-capture tests/{codegen-units,run-make,ui,incremental}
./x.py test --stage 0 --test-args=--no-capture tests/{codegen-units,run-make,ui,incremental}
popd
7 changes: 4 additions & 3 deletions compiler/rustc_codegen_gcc/build_system/src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,8 +561,6 @@ fn asm_tests(env: &Env, args: &TestArg) -> Result<(), String> {
// FIXME: create a function "display_if_not_quiet" or something along the line.
println!("[TEST] rustc asm test suite");

env.insert("COMPILETEST_FORCE_STAGE0".to_string(), "1".to_string());

let codegen_backend_path = format!(
"{pwd}/target/{channel}/librustc_codegen_gcc.{dylib_ext}",
pwd = std::env::current_dir()
Expand All @@ -588,6 +586,8 @@ fn asm_tests(env: &Env, args: &TestArg) -> Result<(), String> {
&"always",
&"--stage",
&"0",
&"--set",
&"build.compiletest-allow-stage0=true",
&"tests/assembly-llvm/asm",
&"--compiletest-rustc-args",
&rustc_args,
Expand Down Expand Up @@ -1047,7 +1047,6 @@ where

// FIXME: create a function "display_if_not_quiet" or something along the line.
println!("[TEST] rustc {test_type} test suite");
env.insert("COMPILETEST_FORCE_STAGE0".to_string(), "1".to_string());

let extra =
if args.is_using_gcc_master_branch() { "" } else { " -Csymbol-mangling-version=v0" };
Expand All @@ -1070,6 +1069,8 @@ where
&"always",
&"--stage",
&"0",
&"--set",
&"build.compiletest-allow-stage0=true",
&format!("tests/{test_type}"),
&"--compiletest-rustc-args",
&rustc_args,
Expand Down
Loading