Skip to content

Commit 9b4f16b

Browse files
committed
Re-unignore environment test on MinGW
1 parent 1498347 commit 9b4f16b

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/libstd/sys/windows/os.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ impl Iterator for Env {
9797
let pos = match s[1..].iter().position(|&u| u == b'=' as u16).map(|p| p + 1) {
9898
Some(p) => p,
9999
None => continue,
100-
}
100+
};
101101
return Some((
102102
OsStringExt::from_wide(&s[..pos]),
103103
OsStringExt::from_wide(&s[pos+1..]),

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ use std::env::*;
1414
fn main() {
1515
for (k, v) in vars_os() {
1616
let v2 = var_os(&k);
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),
17+
assert!(v2.as_ref().map(|s| &**s) == Some(&*v),
2118
"bad vars->var transition: {:?} {:?} {:?}", k, v, v2);
2219
}
2320
}

0 commit comments

Comments
 (0)