Merge pull request #2265 from olsonjeffery/master

ignore high_level_loop tests in std

Author: brson

src/libstd/timer.rs

@@ -140,11 +140,13 @@ crust fn delayed_send_close_cb(handle: *uv::ll::uv_timer_t) unsafe {
 #[cfg(test)]
 mod test {
     #[test]
+    #[ignore]
     fn test_timer_simple_sleep_test() {
         sleep(1u);
     }
 
     #[test]
+    #[ignore]
     fn test_timer_recv_timeout_before_time_passes() {
         let expected = rand::rng().gen_str(16u);
         let test_po = comm::port::<str>();
@@ -163,6 +165,7 @@ mod test {
     }
 
     #[test]
+    #[ignore]
     fn test_timer_recv_timeout_after_time_passes() {
         let expected = rand::rng().gen_str(16u);
         let fail_msg = rand::rng().gen_str(16u);

src/libstd/uv_global_loop.rs

@@ -365,7 +365,7 @@ mod test {
         log(debug, "global_loop timer test: msg recv on exit_po, done..");
     }
     #[test]
-    #[ignore(cfg(target_os = "freebsd"))]
+    #[ignore]
     fn test_uv_global_loop_high_level_global_timer() unsafe {
         let hl_loop = get_gl();
         task::spawn_sched(task::manual_threads(1u), {||

src/libstd/uv_hl.rs

@@ -473,7 +473,7 @@ mod test {
     }
 
     #[test]
-    #[ignore(cfg(target_os = "freebsd"))]
+    #[ignore]
     fn test_uv_hl_async() unsafe {
         let exit_po = comm::port::<()>();
         let exit_ch = comm::chan(exit_po);