Cleanup the existing platform-specific ignored tests

4 files changed, 11 insertions, 55 deletions

diff --git a/src/test/stdtest/io.rs b/src/test/stdtest/io.rs
index d84b80e2ed3..3eafa96b651 100644
--- a/src/test/stdtest/io.rs
+++ b/src/test/stdtest/io.rs
@@ -4,9 +4,9 @@ import std::io;
 import std::str;
 import std::result;
 
-#[cfg(target_os = "linux")]
-#[cfg(target_os = "win32")]
+// FIXME (726)
 #[test]
+#[ignore(cfg(target_os = "macos"))]
 fn test_simple() {
     let tmpfile: str = "test/run-pass/lib-io-test-simple.tmp";
     log tmpfile;
@@ -23,12 +23,6 @@ fn test_simple() {
     assert (str::eq(frood, frood2));
 }
 
-// FIXME (726)
-#[cfg(target_os = "macos")]
-#[test]
-#[ignore]
-fn test_simple() { }
-
 #[test]
 fn file_reader_not_exist() {
     alt io::file_reader("not a file") {
@@ -39,9 +33,9 @@ fn file_reader_not_exist() {
     }
 }
 
-#[cfg(target_os = "linux")]
-#[cfg(target_os = "win32")]
 #[test]
+// FIXME (726)
+#[ignore(cfg(target_os = "macos"))]
 fn file_buf_writer_bad_name() {
     alt io::file_buf_writer("/?", []) {
       result::err(e) {
@@ -51,15 +45,9 @@ fn file_buf_writer_bad_name() {
     }
 }
 
-// FIXME (726)
-#[cfg(target_os = "macos")]
-#[test]
-#[ignore]
-fn file_buf_writer_bad_name() { }
-
-#[cfg(target_os = "linux")]
-#[cfg(target_os = "win32")]
 #[test]
+// FIXME (726)
+#[ignore(cfg(target_os = "macos"))]
 fn buffered_file_buf_writer_bad_name() {
     alt io::buffered_file_buf_writer("/?") {
       result::err(e) {
@@ -68,9 +56,3 @@ fn buffered_file_buf_writer_bad_name() {
       result::ok(_) { fail; }
     }
 }
-
-// FIXME (726)
-#[cfg(target_os = "macos")]
-#[test]
-#[ignore]
-fn buffered_file_buf_writer_bad_name() { }
diff --git a/src/test/stdtest/run.rs b/src/test/stdtest/run.rs
index 15bcf4e5320..187cab35ee0 100644
--- a/src/test/stdtest/run.rs
+++ b/src/test/stdtest/run.rs
@@ -7,21 +7,13 @@ import std::str;
 import std::vec;
 
 // Regression test for memory leaks
-#[cfg(target_os = "linux")]
-#[cfg(target_os = "macos")]
-#[test]
+#[ignore(cfg(target_os = "win32"))] // FIXME
 fn test_leaks() {
     run::run_program("echo", []);
     run::start_program("echo", []);
     run::program_output("echo", []);
 }
 
-// FIXME
-#[cfg(target_os = "win32")]
-#[test]
-#[ignore]
-fn test_leaks() { }
-
 #[test]
 fn test_pipes() unsafe {
     let pipe_in = os::pipe();
diff --git a/src/test/stdtest/task.rs b/src/test/stdtest/task.rs
index 1c983251937..4e968e57942 100644
--- a/src/test/stdtest/task.rs
+++ b/src/test/stdtest/task.rs
@@ -7,13 +7,7 @@ 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")]
+#[ignore(cfg(target_os = "win32"))]
 fn test_unsupervise() {
     fn f(&&_i: ()) { task::unsupervise(); fail; }
     task::spawn((), f);
@@ -48,13 +42,7 @@ 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")]
+#[ignore(cfg(target_os = "win32"))]
 fn test_join_chan_fail() {
     fn failer(&&_i: ()) { task::unsupervise(); fail }
 
diff --git a/src/test/stdtest/vec.rs b/src/test/stdtest/vec.rs
index 1bbb003e1c4..de3b15d3a7b 100644
--- a/src/test/stdtest/vec.rs
+++ b/src/test/stdtest/vec.rs
@@ -450,9 +450,9 @@ fn init() {
     assert v == [1, 2];
 }
 
-#[cfg(target_os = "linux")]
-#[cfg(target_os = "mac")]
 #[test]
+// FIXME: Windows can't undwind
+#[ignore(cfg(target_os = "win32"))]
 fn init_empty() {
 
     let r = task::join(
@@ -463,12 +463,6 @@ fn init_empty() {
     assert r == task::tr_failure
 }
 
-// FIXME: Windows can't undwind
-#[cfg(target_os = "win32")]
-#[test]
-#[ignore]
-fn init_empty() { }
-
 #[test]
 fn concat() {
     assert vec::concat([[1], [2,3]]) == [1, 2, 3];