diff options
| author | bors <bors@rust-lang.org> | 2014-01-18 07:36:43 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-18 07:36:43 -0800 |
| commit | bf07c80838e59cb21748f7e3b092ced96f41a208 (patch) | |
| tree | 2094aaef84806076f0d58592db1cef9be5464534 | |
| parent | 2952685917cb17a3d849cb02d17ce71ccecfb855 (diff) | |
| parent | 50f4a0ec7458a4c14d4814cc71b289bf12b5ce6b (diff) | |
auto merge of #11629 : brson/rust/whattayaknowitsmoreandroidfixes, r=cmr
| -rw-r--r-- | src/test/bench/shootout-reverse-complement.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass-fulldeps/macro-crate.rs (renamed from src/test/run-pass/macro-crate.rs) | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/test/bench/shootout-reverse-complement.rs b/src/test/bench/shootout-reverse-complement.rs index 161f23182d1..43167458e86 100644 --- a/src/test/bench/shootout-reverse-complement.rs +++ b/src/test/bench/shootout-reverse-complement.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// xfail-android doesn't terminate? + use std::iter::range_step; use std::io::{stdin, stdout, File}; diff --git a/src/test/run-pass/macro-crate.rs b/src/test/run-pass-fulldeps/macro-crate.rs index 0073c1c33fb..0073c1c33fb 100644 --- a/src/test/run-pass/macro-crate.rs +++ b/src/test/run-pass-fulldeps/macro-crate.rs |