Skip to content

Override compile-time test environment paths for relocated test execution #16816

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

Draft
elyouG wants to merge 3 commits into
base: master
Choose a base branch
from
+17 −3
Draft

Override compile-time test environment paths for relocated test execution #16816

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8106668
Allow overriding OUT_DIR for test and bench units
elyouG Mar 31, 2026
b6922da
Allow overriding CARGO_MANIFEST_DIR for test and bench units
elyouG Mar 31, 2026
3357c98
Allow overriding CARGO_BIN_EXE paths for test and bench units
elyouG Mar 31, 2026
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
20 changes: 17 additions & 3 deletions src/cargo/core/compiler/artifact.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ pub fn get_env(
) -> CargoResult<HashMap<String, OsString>> {
let mut env = HashMap::new();

if unit.target.is_test() || unit.target.is_bench() {
if let Ok(value) = build_runner.bcx.gctx.get_env("__CARGO_TEST_OUT_DIR_OVERRIDE") {
env.insert("OUT_DIR".to_string(), OsString::from(value));
}
if let Ok(value) = build_runner.bcx.gctx.get_env("__CARGO_TEST_MANIFEST_DIR_OVERRIDE") {
env.insert("CARGO_MANIFEST_DIR".to_string(), OsString::from(value));
}
}

// Add `CARGO_BIN_EXE_` environment variables for building tests.
//
// These aren't built for `cargo check`, so can't use `dependencies`
Expand All @@ -35,12 +44,17 @@ pub fn get_env(
// For `cargo check` builds we do not uplift the CARGO_BIN_EXE_ artifacts to the
// artifact-dir. We do not want to provide a path to a non-existent binary but we still
// need to provide *something* so `env!("CARGO_BIN_EXE_...")` macros will compile.
let exe_path = build_runner
let exe_path = if let Ok(dir) = build_runner.bcx.gctx.get_env("__CARGO_TEST_BIN_EXE_DIR_OVERRIDE") {
let mut path = std::path::PathBuf::from(dir);
path.push(&name);
path.into_os_string()
} else {
build_runner
.files()
.bin_link_for_target(bin_target, unit.kind, build_runner.bcx)?
.map(|path| path.as_os_str().to_os_string())
.unwrap_or_else(|| OsString::from(format!("placeholder:{name}")));

.unwrap_or_else(|| OsString::from(format!("placeholder:{name}")))
};
let key = format!("CARGO_BIN_EXE_{name}");
env.insert(key, exe_path);
}
Expand Down