diff options
| author | bors <bors@rust-lang.org> | 2013-04-20 23:51:51 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-04-20 23:51:51 -0700 |
| commit | 2104cd69d491c622a70208a7b70a4d948fc30d05 (patch) | |
| tree | a3cce61e59bc515ff0cf9d328d144074a4451331 | |
| parent | 0e017ab4e0d59c82109604fa1917abd66b72e0e0 (diff) | |
| parent | 59caef02ed4f8213adb73aa04828e0ab71cec8a2 (diff) | |
| download | rust-2104cd69d491c622a70208a7b70a4d948fc30d05.tar.gz rust-2104cd69d491c622a70208a7b70a4d948fc30d05.zip | |
auto merge of #5986 : brson/rust/bench, r=brson
| -rw-r--r-- | src/test/bench/shootout-fasta-redux.rs | 2 | ||||
| -rw-r--r-- | src/test/bench/shootout-threadring.rs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/test/bench/shootout-fasta-redux.rs b/src/test/bench/shootout-fasta-redux.rs index 5cb04fcd27a..35b5eab8a28 100644 --- a/src/test/bench/shootout-fasta-redux.rs +++ b/src/test/bench/shootout-fasta-redux.rs @@ -1,3 +1,5 @@ +// xfail-test FIXME #5985 Doesn't typecheck on x86 + use core::cast::transmute; use core::from_str::FromStr; use core::libc::{FILE, STDOUT_FILENO, c_int, fdopen, fputc, fputs, fwrite}; diff --git a/src/test/bench/shootout-threadring.rs b/src/test/bench/shootout-threadring.rs index 9eb8a29cec0..213c5140ccf 100644 --- a/src/test/bench/shootout-threadring.rs +++ b/src/test/bench/shootout-threadring.rs @@ -10,6 +10,8 @@ // Based on threadring.erlang by Jira Isa +// xfail-test FIXME #5985 OOM's on the mac bot + fn start(n_tasks: int, token: int) { let mut (p, ch1) = comm::stream(); ch1.send(token); |