Skip to content

Commit

Permalink
auto merge of #5986 : brson/rust/bench, r=brson
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Apr 21, 2013
2 parents 0e017ab + 59caef0 commit 2104cd6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/test/bench/shootout-fasta-redux.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 2 additions & 0 deletions src/test/bench/shootout-threadring.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 2104cd6

Please sign in to comment.