rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix cargo path logic

Browse Source
This commit is contained in:
Ralf Jung
2024-12-01 11:04:17 +01:00
parent c4cab8a15c
commit dd2ac08cfe
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/src/core/build_steps/test.rs
View File

@@ -305,9 +305,10 @@ impl Step for Cargo {
// those features won't be able to land. // those features won't be able to land.
cargo.env("CARGO_TEST_DISABLE_NIGHTLY", "1"); cargo.env("CARGO_TEST_DISABLE_NIGHTLY", "1");
cargo.env("PATH", path_for_cargo(builder, compiler)); cargo.env("PATH", path_for_cargo(builder, compiler));
// Cargo's test suite requires configurations from its own `.cargo/config.toml`. // Cargo's test suite uses `CARGO_RUSTC_CURRENT_DIR` to determine the path that `file!` is
// Change to the directory so Cargo can read from it. // relative to. Cargo no longer sets this env var, so we have to do that. This has to be the
cargo.current_dir(builder.src.join(Self::CRATE_PATH)); // same value as `-Zroot-dir`.
cargo.env("CARGO_RUSTC_CURRENT_DIR", builder.src.display().to_string());
#[cfg(feature = "build-metrics")] #[cfg(feature = "build-metrics")]
builder.metrics.begin_test_suite( builder.metrics.begin_test_suite(