about summary refs log tree commit diff
path: root/src/test/bench
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-22 07:16:17 +0000
committerbors <bors@rust-lang.org>2014-07-22 07:16:17 +0000
commit8d43e4474aba98d99e2778dcdcd5b0515b7b8176 (patch)
tree6fb6f271ba16b79fdd6b1edd30bed9a88664f10b /src/test/bench
parent32f4d996ea2bea69fe363dca4e6e09b91bbd83f3 (diff)
parent95a1ce6f3f3a31d4e64b04637cd252cc02b623dd (diff)
downloadrust-8d43e4474aba98d99e2778dcdcd5b0515b7b8176.tar.gz
rust-8d43e4474aba98d99e2778dcdcd5b0515b7b8176.zip
auto merge of #15867 : cmr/rust/rewrite-lexer4, r=alexcrichton
Diffstat (limited to 'src/test/bench')
-rw-r--r--src/test/bench/core-std.rs1
-rw-r--r--src/test/bench/msgsend-ring-mutex-arcs.rs1
-rw-r--r--src/test/bench/msgsend-ring-rw-arcs.rs1
-rw-r--r--src/test/bench/noise.rs1
4 files changed, 4 insertions, 0 deletions
diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs
index fd3c4daebdb..9af3c0c6c8c 100644
--- a/src/test/bench/core-std.rs
+++ b/src/test/bench/core-std.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-lexer-test FIXME #15679
 // Microbenchmarks for various functions in std and extra
 
 #![feature(macro_rules)]
diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs
index 2b9abfbc350..a0ff7736b5c 100644
--- a/src/test/bench/msgsend-ring-mutex-arcs.rs
+++ b/src/test/bench/msgsend-ring-mutex-arcs.rs
@@ -16,6 +16,7 @@
 // This also serves as a pipes test, because Arcs are implemented with pipes.
 
 // no-pretty-expanded FIXME #15189
+// ignore-lexer-test FIXME #15679
 
 extern crate time;
 
diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs
index afed753f455..6512ecfb3e2 100644
--- a/src/test/bench/msgsend-ring-rw-arcs.rs
+++ b/src/test/bench/msgsend-ring-rw-arcs.rs
@@ -16,6 +16,7 @@
 // This also serves as a pipes test, because Arcs are implemented with pipes.
 
 // no-pretty-expanded FIXME #15189
+// ignore-lexer-test FIXME #15679
 
 extern crate time;
 
diff --git a/src/test/bench/noise.rs b/src/test/bench/noise.rs
index 6ec1d5395cf..bdca0349036 100644
--- a/src/test/bench/noise.rs
+++ b/src/test/bench/noise.rs
@@ -10,6 +10,7 @@
 
 // Multi-language Perlin noise benchmark.
 // See https://github.com/nsf/pnoise for timings and alternative implementations.
+// ignore-lexer-test FIXME #15679
 
 use std::f32::consts::PI;
 use std::rand::{Rng, StdRng};