about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2014-04-25 01:37:27 -0400
committerAndrew Gallant <jamslam@gmail.com>2014-04-25 01:37:27 -0400
commit7269bc77e1d1f1babfd159db97024cbd535c47a7 (patch)
tree43a8f5b7a23e655c11ee0b2fcfb17836e267c69c
parent09a8b38550569931330af66e7a3a00cc1029173d (diff)
downloadrust-7269bc77e1d1f1babfd159db97024cbd535c47a7.tar.gz
rust-7269bc77e1d1f1babfd159db97024cbd535c47a7.zip
Ignore regex tests (regular, cfail and benchmark) on Windows (for now).
-rw-r--r--src/libregex/lib.rs3
-rw-r--r--src/test/bench/shootout-regex-dna.rs2
-rw-r--r--src/test/compile-fail/syntax-extension-regex-invalid.rs2
3 files changed, 6 insertions, 1 deletions
diff --git a/src/libregex/lib.rs b/src/libregex/lib.rs
index 7dd27f196e0..cd5d387bfa0 100644
--- a/src/libregex/lib.rs
+++ b/src/libregex/lib.rs
@@ -386,7 +386,8 @@ mod parse;
 mod re;
 mod vm;
 
-#[cfg(test)]
+// FIXME(#13725) windows needs fixing.
+#[cfg(test, not(windows))]
 mod test;
 
 /// The `program` module exists to support the `regex!` macro. Do not use.
diff --git a/src/test/bench/shootout-regex-dna.rs b/src/test/bench/shootout-regex-dna.rs
index 69c6c73afd7..0f86b8043a0 100644
--- a/src/test/bench/shootout-regex-dna.rs
+++ b/src/test/bench/shootout-regex-dna.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// FIXME(#13725) windows needs fixing.
+// ignore-win32
 // ignore-stage1
 // ignore-cross-compile #12102
 
diff --git a/src/test/compile-fail/syntax-extension-regex-invalid.rs b/src/test/compile-fail/syntax-extension-regex-invalid.rs
index dd607568eb8..0e072dc1c06 100644
--- a/src/test/compile-fail/syntax-extension-regex-invalid.rs
+++ b/src/test/compile-fail/syntax-extension-regex-invalid.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// FIXME(#13725) windows needs fixing.
+// ignore-win32
 // ignore-stage1
 
 #![feature(phase)]