Skip to content

[rust_verify_test] feat: use a temp dir as target dir to isolate cargo test runs #2490

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
mkovaxx merged 1 commit into from
May 27, 2026
+32 −14
Merged

[rust_verify_test] feat: use a temp dir as target dir to isolate cargo test runs #2490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 12 deletions source/rust_verify_test/tests/cargo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,19 @@ fn run_cargo_verus_for_dir(dir: &str) {
extra_verus_args.extend(args.split(" "));
}

// Don't reuse any artifacts from previous runs
let args = vec!["clean"];
let run = run_cargo(&args, &test_dir.as_path());
assert!(run.status.success());
// Use a temp dir for the target dir to isolate each test run
let target_dir = tempdir().expect("Failed to create temporary target directory");

let mut args = vec!["verify"];
args.push("--");
args.extend(&extra_verus_args);
let run = run_cargo_verus(&args, &test_dir.as_path());
let run = run_cargo_verus_with_target(&args, &test_dir, target_dir.path());
assert!(run.status.success());

let mut args = vec!["build"];
args.push("--");
args.extend(&extra_verus_args);
let run = run_cargo_verus(&args, &test_dir.as_path());
let run = run_cargo_verus_with_target(&args, &test_dir, target_dir.path());
assert!(run.status.success());
}

Expand All @@ -91,17 +89,15 @@ fn run_vanilla_cargo_for_dir(dir: &str) {
return;
}

// Don't reuse any artifacts from previous runs
let args = vec!["clean"];
let run = run_cargo(&args, &test_dir.as_path());
assert!(run.status.success());
// Use a temp dir for the target dir to isolate each test run
let target_dir = tempdir().expect("Failed to create temporary target directory");

let args = vec!["check"];
let run = run_cargo(&args, &test_dir.as_path());
let run = run_cargo_with_target(&args, &test_dir, target_dir.path());
assert!(run.status.success());

let args = vec!["build"];
let run = run_cargo(&args, &test_dir.as_path());
let run = run_cargo_with_target(&args, &test_dir, target_dir.path());
assert!(run.status.success());
}

Expand Down
26 changes: 24 additions & 2 deletions source/rust_verify_test/tests/common/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,14 @@ pub fn run_verus(
}

pub fn run_cargo_verus(args: &[&str], dir: &std::path::Path) -> std::process::Output {
run_cargo_verus_with_target(args, dir, &dir.join("target"))
}

pub fn run_cargo_verus_with_target(
args: &[&str],
dir: &std::path::Path,
target_dir: &std::path::Path,
) -> std::process::Output {
if std::env::var("VERUS_IN_VARGO").is_err() {
panic!("not running in vargo, read the README for instructions");
}
Expand Down Expand Up @@ -471,6 +479,9 @@ pub fn run_cargo_verus(args: &[&str], dir: &std::path::Path) -> std::process::Ou

let mut child = std::process::Command::new(bin);
child.current_dir(dir);
child.env("CARGO_TARGET_DIR", target_dir);
child.env("CARGO_BUILD_TARGET_DIR", target_dir);
child.env("CARGO_BUILD_BUILD_DIR", target_dir);

let z3 = std::env::var("VERUS_Z3_PATH")
.map(|p| {
Expand All @@ -489,7 +500,7 @@ pub fn run_cargo_verus(args: &[&str], dir: &std::path::Path) -> std::process::Ou
child.env("VERUS_Z3_PATH", z3);

let child = child
.args(&args[..])
.args(args)
.stdout(std::process::Stdio::piped())
.stderr(std::process::Stdio::piped())
.spawn()
Expand All @@ -504,6 +515,14 @@ pub fn run_cargo_verus(args: &[&str], dir: &std::path::Path) -> std::process::Ou

// Assumes normal `cargo` is in the caller's path
pub fn run_cargo(args: &[&str], dir: &std::path::Path) -> std::process::Output {
run_cargo_with_target(args, dir, &dir.join("target"))
}

pub fn run_cargo_with_target(
args: &[&str],
dir: &std::path::Path,
target_dir: &std::path::Path,
) -> std::process::Output {
// if std::env::var("VERUS_IN_VARGO").is_err() {
// panic!("not running in vargo, read the README for instructions");
// }
Expand All @@ -513,9 +532,12 @@ pub fn run_cargo(args: &[&str], dir: &std::path::Path) -> std::process::Output {
// Remove Verus-specific RUSTFLAGS that are set by vargo, as they cause
// verus_builtin and vstd to require unstable features not available on stable Rust
child.env_remove("RUSTFLAGS");
child.env("CARGO_TARGET_DIR", target_dir);
child.env("CARGO_BUILD_TARGET_DIR", target_dir);
child.env("CARGO_BUILD_BUILD_DIR", target_dir);

let child = child
.args(&args[..])
.args(args)
.stdout(std::process::Stdio::piped())
.stderr(std::process::Stdio::piped())
.spawn()
Expand Down