auto merge of #11506 : brson/rust/androidfixes, r=cmr

2014-01-12 19:36:37 -08:00 · 2014-01-12 19:36:37 -08:00 · b93a4dac2e
parent cb9c102392 58097c1a73
commit b93a4dac2e
2 changed files with 2 additions and 0 deletions
--- a/src/test/run-pass/capturing-logging.rs
+++ b/src/test/run-pass/capturing-logging.rs
@ -9,6 +9,7 @@
 // except according to those terms.

 // xfail-fast
+// xfail-android (FIXME #11419)
 // exec-env:RUST_LOG=info

 #[no_uv];
--- a/src/test/run-pass/native-always-waits.rs
+++ b/src/test/run-pass/native-always-waits.rs
@ -9,6 +9,7 @@
 // except according to those terms.

 // xfail-fast
+// xfail-android (FIXME #11419)

 extern mod native;