Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
636ddcb
Ignore allocation bytes in one more mir-opt test
uweigand Jul 15, 2024
fae6037
Windows: move BSD socket shims to netc
ChrisDenton Jul 14, 2024
572ba97
Fix git safe-directory path for docker images
ehuss Jul 17, 2024
aebf4d0
Add `wasm32-wasip2` to `build-manifest` tool
alexcrichton Jul 17, 2024
1b4972b
compiletest/rmake: adjust docs for rmake.rs setup and add FIXMEs
jieyouxu Jul 19, 2024
23f32f4
compiletest/rmake: make `{source,build}_root` path calculation more r…
jieyouxu Jul 19, 2024
6ca3109
compiletest/rmake: improve `stage` explanation
jieyouxu Jul 19, 2024
2eb8810
compiletest/rmake: move `stage_std_path` and `recipe_bin` closer to u…
jieyouxu Jul 19, 2024
01ed951
compiletest/rmake: improve clarity of `support_lib_{path,deps,deps_de…
jieyouxu Jul 19, 2024
49ca9ff
compiletest/rmake: cleanup dylib search paths related calculations
jieyouxu Jul 19, 2024
9f2a660
compiletest/rmake: cleanup library search paths
jieyouxu Jul 19, 2024
cf5edfe
compiletest/rmake: cleanup rmake exe extension calculation
jieyouxu Jul 19, 2024
f5488f0
compiletest/rmake: rename `cmd` to `rustc`
jieyouxu Jul 19, 2024
2383e9d
compiletest/rmake: prune useless env vars and explain passed rustc op…
jieyouxu Jul 19, 2024
aa22102
compiletest/rmake: better explain why stage0 sysroot is needed if for…
jieyouxu Jul 19, 2024
993d83a
compiletest/rmake: cleanup `stage_std_path` and `recipe_dylib_search_…
jieyouxu Jul 19, 2024
063ed0f
Improve display of trait bounds when there are more than two
GuillaumeGomez Jul 19, 2024
590c01a
Reduce width to ensure that the name is wider and thus still triggeri…
GuillaumeGomez Jul 19, 2024
eec3c3d
Add GUI test for trait bounds display
GuillaumeGomez Jul 19, 2024
b8d4e4d
Allow concat in repetitions
c410-f3r Jul 20, 2024
3e77f7c
compiletest/rmake: prune unused `RUST_BUILD_STAGE` and explain env va…
jieyouxu Jul 19, 2024
c863525
compiletest/rmake: improve comments
jieyouxu Jul 19, 2024
2c867d0
compiletest/rmake: avoid double test directory for rmake.rs tests
jieyouxu Jul 20, 2024
a8463be
compiletest/rmake: simplify path calculations
jieyouxu Jul 20, 2024
af735f3
Remove _tls_used hack
ChrisDenton Jul 20, 2024
fba6e1e
Rollup merge of #127720 - c410-f3r:concat-rep, r=cjgillot
matthiaskrgr Jul 20, 2024
b3d682c
Rollup merge of #127734 - ChrisDenton:netc, r=Mark-Simulacrum
matthiaskrgr Jul 20, 2024
ea9b1af
Rollup merge of #127752 - uweigand:s390x-miropt-update, r=Mark-Simula…
matthiaskrgr Jul 20, 2024
60f3891
Rollup merge of #127839 - ehuss:safe-directory-docker, r=Mark-Simulacrum
matthiaskrgr Jul 20, 2024
dd8113e
Rollup merge of #127867 - alexcrichton:add-wasm32-wasip2-to-dist-mani…
matthiaskrgr Jul 20, 2024
ae28d5c
Rollup merge of #127958 - jieyouxu:compiletest-rmake-cleanup, r=Kobzol
matthiaskrgr Jul 20, 2024
17aaba7
Rollup merge of #127975 - GuillaumeGomez:fix-trait-bounds-display, r=…
matthiaskrgr Jul 20, 2024
8fe93c9
Rollup merge of #128005 - ChrisDenton:msvc-include, r=joboet
matthiaskrgr Jul 20, 2024
File filter

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
compiletest/rmake: better explain why stage0 sysroot is needed if for…
…ced stage0
  • Loading branch information
jieyouxu committed Jul 19, 2024
commit aa22102f2f52f35f0e48688bcc6f90de1ee48b20
25 changes: 21 additions & 4 deletions src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3633,12 +3633,29 @@ impl<'test> TestCx<'test> {
// annotated with `#[must_use]`.
rustc.arg("-Dunused_must_use");

// FIXME(jieyouxu): explain this!
// > `cg_clif` uses `COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0` for running the rustc
// > test suite. With the introduction of rmake.rs this broke. `librun_make_support.rlib` is
// > compiled using the bootstrap rustc wrapper which sets `--sysroot
// > build/aarch64-unknown-linux-gnu/stage0-sysroot`, but then compiletest will compile
// > `rmake.rs` using the sysroot of the bootstrap compiler causing it to not find the
// > `libstd.rlib` against which `librun_make_support.rlib` is compiled.
//
// The gist here is that we have to pass the proper stage0 sysroot if we want
//
// ```
// $ COMPILETEST_FORCE_STAGE0=1 ./x test run-make --stage 0
// ```
//
// to work correctly.
//
// See <https://github.com/rust-lang/rust/pull/122248> for more background.
if std::env::var_os("COMPILETEST_FORCE_STAGE0").is_some() {
let mut stage0_sysroot = build_root.clone();
stage0_sysroot.push("stage0-sysroot");
let stage0_sysroot = {
let mut p = build_root.clone();
p.push("stage0-sysroot");
p
};
debug!(?stage0_sysroot);
debug!(exists = stage0_sysroot.exists());

rustc.arg("--sysroot").arg(&stage0_sysroot);
}
Expand Down