user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4087 from RalfJung/bench-toolchain

Browse source 
./miri bench: set toolchain explicitly
This commit is contained in:
Ralf Jung 2024-12-11 18:48:35 +00:00 • committed by GitHub
commit 6748167e80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/tools/miri/miri-script/src/commands.rs
View file

@ -409,6 +409,7 @@ impl Command {
OsString::new()
};
let target_flag = &target_flag;
let toolchain = active_toolchain()?;
// Run the requested benchmarks
for bench in benches {
let current_bench = path!(benches_dir / bench / "Cargo.toml");
@ -416,7 +417,7 @@ impl Command {
// That seems to make Windows CI happy.
cmd!(
sh,
"{program_name} {args...} 'cargo miri run '{target_flag}' --manifest-path \"'{current_bench}'\"'"
"{program_name} {args...} 'cargo +'{toolchain}' miri run '{target_flag}' --manifest-path \"'{current_bench}'\"'"
)
.run()?;
}