mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #3168 - RalfJung:set_var, r=RalfJung

Browse Source 
get rid of our last uses of set_var

Fixes https://github.com/rust-lang/miri/issues/2783
This commit is contained in:
bors 2023-11-16 10:00:13 +00:00
commit 7df74ebad1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/miri/tests/compiletest.rs
View File

@ -79,6 +79,11 @@ fn test_config(target: &str, path: &str, mode: Mode, with_dependencies: bool) ->
program.args.push(flag); program.args.push(flag);
} }
// Add a test env var to do environment communication tests.
program.envs.push(("MIRI_ENV_VAR_TEST".into(), Some("0".into())));
// Let the tests know where to store temp files (they might run for a different target, which can make this hard to find).
program.envs.push(("MIRI_TEMP".into(), Some(env::temp_dir().into())));
let mut config = Config { let mut config = Config {
target: Some(target.to_owned()), target: Some(target.to_owned()),
stderr_filters: STDERR.clone(), stderr_filters: STDERR.clone(),
@ -232,11 +237,6 @@ fn main() -> Result<()> {
} }
} }
// Add a test env var to do environment communication tests.
env::set_var("MIRI_ENV_VAR_TEST", "0");
// Let the tests know where to store temp files (they might run for a different target, which can make this hard to find).
env::set_var("MIRI_TEMP", env::temp_dir());
ui(Mode::Pass, "tests/pass", &target, WithoutDependencies)?; ui(Mode::Pass, "tests/pass", &target, WithoutDependencies)?;
ui(Mode::Pass, "tests/pass-dep", &target, WithDependencies)?; ui(Mode::Pass, "tests/pass-dep", &target, WithDependencies)?;
ui(Mode::Panic, "tests/panic", &target, WithDependencies)?; ui(Mode::Panic, "tests/panic", &target, WithDependencies)?;