---

yaml
---
r: 5886
b: refs/heads/master
c: c10eb22
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c38f7dfd7ccf2e57913500f8a7548b2b8de1932
+refs/heads/master: c10eb221da59f6fabe308e79d11df5b86855da5a

trunk/src/compiletest/procsrv.rs

@@ -164,7 +164,7 @@ fn maybe_with_lib_path<@T>(_path: str, f: fn@() -> T) -> T {
     f()
 }
 
-fn with_lib_path<@T>(path: str, f: fn() -> T) -> T {
+fn with_lib_path<@T>(path: str, f: fn@() -> T) -> T {
     let maybe_oldpath = getenv(util::lib_path_env_var());
     append_lib_path(path);
     let res = f();

trunk/src/test/run-pass/terminate-in-initializer.rs

@@ -1,3 +1,4 @@
+// xfail-win32 leaks
 // Issue #787
 // Don't try to clean up uninitizaed locals
 

trunk/src/test/stdtest/task.rs

@@ -5,7 +5,15 @@ import std::comm;
 #[test]
 fn test_sleep() { task::sleep(1000000u); }
 
+// FIXME: Leaks on windows
 #[test]
+#[cfg(target_os = "win32")]
+#[ignore]
+fn test_unsupervise() { }
+
+#[test]
+#[cfg(target_os = "macos")]
+#[cfg(target_os = "linux")]
 fn test_unsupervise() {
     fn# f(&&_i: ()) { task::unsupervise(); fail; }
     task::spawn((), f);
@@ -38,7 +46,15 @@ fn test_join_chan() {
     }
 }
 
+// FIXME: Leaks on windows
+#[test]
+#[cfg(target_os = "win32")]
+#[ignore]
+fn test_join_chan_fail() { }
+
 #[test]
+#[cfg(target_os = "macos")]
+#[cfg(target_os = "linux")]
 fn test_join_chan_fail() {
     fn# failer(&&_i: ()) { task::unsupervise(); fail }