Skip to content

Commit 2978af0

Browse files
committed
Auto merge of #29910 - tbu-:pr_env_revert_mingw_weirdness, r=alexcrichton
2 parents edcfeb7 + 2731c82 commit 2978af0

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/test/run-pass/env-vars.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ use std::env::*;
1414
fn main() {
1515
for (k, v) in vars_os() {
1616
let v2 = var_os(&k);
17-
assert!(v2.as_ref().map(|s| &**s) == Some(&*v),
17+
// MingW seems to set some funky environment variables like
18+
// "=C:=C:\MinGW\msys\1.0\bin" and "!::=::\" that are returned
19+
// from vars() but not visible from var().
20+
assert!(v2.is_none() || v2.as_ref().map(|s| &**s) == Some(&*v),
1821
"bad vars->var transition: {:?} {:?} {:?}", k, v, v2);
1922
}
2023
}

0 commit comments

Comments
 (0)