mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-24 07:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

tests: fix some failures on windows due to a missing TEMP environment variable

Browse source
This commit is contained in:
Thomas Castiglione 2024-02-14 22:38:26 +08:00 committed by gulbanana
parent 38b27de8e3
commit fed682a430
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
cli/tests/common/mod.rs
View file

@ -114,27 +114,29 @@ impl TestEnvironment {
cmd.env("SSL_CERT_FILE", "/dev/null");
}
if cfg!(all(windows, target_env = "gnu")) {
// MinGW executables cannot run without `mingw\bin` in the PATH (which we're
// clearing above), so we add it again here.
if let Ok(path_var) = std::env::var("PATH").or_else(|_| std::env::var("Path")) {
// There can be slight variations of this path (e.g. `mingw64\bin`) so we're
// intentionally being lenient here.
let mingw_directories = path_var
.split(';')
.filter(|dir| dir.contains("mingw"))
.join(";");
if !mingw_directories.is_empty() {
cmd.env("PATH", mingw_directories);
}
}
// MinGW uses `TEMP` to create temporary directories, which we need for some
if cfg!(windows) {
// Windows uses `TEMP` to create temporary directories, which we need for some
// tests.
if let Ok(tmp_var) = std::env::var("TEMP") {
cmd.env("TEMP", tmp_var);
}
if cfg!(target_env = "gnu") {
// MinGW executables cannot run without `mingw\bin` in the PATH (which we're
// clearing above), so we add it again here.
if let Ok(path_var) = std::env::var("PATH").or_else(|_| std::env::var("Path")) {
// There can be slight variations of this path (e.g. `mingw64\bin`) so we're
// intentionally being lenient here.
let mingw_directories = path_var
.split(';')
.filter(|dir| dir.contains("mingw"))
.join(";");
if !mingw_directories.is_empty() {
cmd.env("PATH", mingw_directories);
}
}
}
}
cmd