diff options
| author | bors <bors@rust-lang.org> | 2014-01-12 19:36:37 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-12 19:36:37 -0800 |
| commit | b93a4dac2e52b67faf778957ba7a997e805d103b (patch) | |
| tree | dbcca78f2cd8b31712a9552205f31e8865a8a26d /src | |
| parent | cb9c1023921aa94dfe38143ba7bf8e14177de235 (diff) | |
| parent | 58097c1a73d2e6e2bbefc1880f68133b16654629 (diff) | |
| download | rust-b93a4dac2e52b67faf778957ba7a997e805d103b.tar.gz rust-b93a4dac2e52b67faf778957ba7a997e805d103b.zip | |
auto merge of #11506 : brson/rust/androidfixes, r=cmr
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/run-pass/capturing-logging.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/native-always-waits.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/test/run-pass/capturing-logging.rs b/src/test/run-pass/capturing-logging.rs index f5230416041..e385c1c14a4 100644 --- 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]; diff --git a/src/test/run-pass/native-always-waits.rs b/src/test/run-pass/native-always-waits.rs index c015ee30639..cddee0be18d 100644 --- 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; |