From a04ba76f8e436d1c1919b0a97bc91190c7252d7a Mon Sep 17 00:00:00 2001
From: Jeff Olson <olson.jeffery@gmail.com>
Date: Wed, 6 Mar 2013 22:02:01 -0800
Subject: [PATCH] core: fix broken tests on windows

---
 src/libcore/os.rs  | 5 ++---
 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 ee14758221a4..c7c0302a099f 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 697bfe63b189..68dca608a480 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();