diff options
| author | Jeff Olson <olson.jeffery@gmail.com> | 2013-03-06 22:02:01 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-03-11 15:38:55 -0700 |
| commit | a04ba76f8e436d1c1919b0a97bc91190c7252d7a (patch) | |
| tree | 0823c6b043c626111cff9036b0c49022ded43727 /src | |
| parent | 25c3c363a82c1bd45065b4f865ef1a086e0b3907 (diff) | |
| download | rust-a04ba76f8e436d1c1919b0a97bc91190c7252d7a.tar.gz rust-a04ba76f8e436d1c1919b0a97bc91190c7252d7a.zip | |
core: fix broken tests on windows
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/os.rs | 5 | ||||
| -rw-r--r-- | src/libcore/vec.rs | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libcore/os.rs b/src/libcore/os.rs index ee14758221a..c7c0302a099 100644 --- a/src/libcore/os.rs +++ b/src/libcore/os.rs @@ -1409,9 +1409,8 @@ mod tests { setenv(~"USERPROFILE", ~"/home/PaloAlto"); fail_unless!(os::homedir() == Some(Path("/home/MountainView"))); - option::iter(&oldhome, |s| setenv(~"HOME", *s)); - option::iter(&olduserprofile, - |s| setenv(~"USERPROFILE", *s)); + oldhome.each(|s| {setenv(~"HOME", *s);true}); + olduserprofile.each(|s| {setenv(~"USERPROFILE", *s);true}); } #[test] diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs index 697bfe63b18..68dca608a48 100644 --- a/src/libcore/vec.rs +++ b/src/libcore/vec.rs @@ -2692,6 +2692,7 @@ mod tests { #[test] #[should_fail] + #[ignore(cfg(windows))] fn test_last_empty() { let a: ~[int] = ~[]; a.last(); |