about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-12-06 17:42:16 +0000
committerbors <bors@rust-lang.org>2014-12-06 17:42:16 +0000
commit358db12a89d6edf4a61cb3c8d170449faea925cc (patch)
tree68b3aa6d3fa2d9a5adb7eb51262aa22f72257ef8 /src/test
parent6f4c11be3b9706d1ba0e1b74b89de1478410a56f (diff)
parent2e2aca9eb8db5a37757d098e2cedd10015b2ce8e (diff)
downloadrust-358db12a89d6edf4a61cb3c8d170449faea925cc.tar.gz
rust-358db12a89d6edf4a61cb3c8d170449faea925cc.zip
auto merge of #19590 : sfackler/rust/fix-android, r=sfackler
Seems to be blocking forever
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-pass/issue-16671.rs2
-rw-r--r--src/test/run-pass/wait-forked-but-failed-child.rs1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/test/run-pass/issue-16671.rs b/src/test/run-pass/issue-16671.rs
index 27a97e1f172..20bf1b260de 100644
--- a/src/test/run-pass/issue-16671.rs
+++ b/src/test/run-pass/issue-16671.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-android seems to block forever
+
 #![forbid(warnings)]
 
 // Pretty printing tests complain about `use std::predule::*`
diff --git a/src/test/run-pass/wait-forked-but-failed-child.rs b/src/test/run-pass/wait-forked-but-failed-child.rs
index 17dfb9e3319..f482b2e1e70 100644
--- a/src/test/run-pass/wait-forked-but-failed-child.rs
+++ b/src/test/run-pass/wait-forked-but-failed-child.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-test
 
 extern crate libc;